From ad414be2141e880e9375b5e6652dad5a8e9a4c67 Mon Sep 17 00:00:00 2001
From: Felix Sidokhine <felix.sidokhine@savoirfairelinux.com>
Date: Tue, 23 Jun 2020 11:35:01 +0300
Subject: [PATCH] fixed bug with SSL Certificate and fixed bug with UserProfile
which caused tests to fail
Change-Id: Id03b7f1c23020fc805a01d01f1ec9d60c3234b0c
---
Dockerfile | 9 ++++
README.md | 17 +++++-
ad-connector/pom.xml | 2 +-
authentication-module/pom.xml | 2 +-
datastore/pom.xml | 2 +-
jami-dht/pom.xml | 2 +-
jami-nameserver/pom.xml | 4 +-
jams-ca/pom.xml | 2 +-
jams-common/pom.xml | 2 +-
jams-server/pom.xml | 2 +-
.../server/core/TomcatConnectorFactory.java | 1 +
.../servlets/api/auth/user/UserServlet.java | 2 +-
ldap-connector/pom.xml | 2 +-
server.key | 52 -------------------
server.pem | 33 ------------
webapp/index.php | 4 --
16 files changed, 37 insertions(+), 101 deletions(-)
create mode 100644 Dockerfile
delete mode 100644 server.key
delete mode 100644 server.pem
delete mode 100644 webapp/index.php
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..591b5571
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,9 @@
+FROM adoptopenjdk/openjdk11:jdk-11.0.2.9-alpine
+
+WORKDIR /opt/jams
+COPY jams/*.jar ./
+COPY jams/libs libs/
+ADD jams/libs libs/
+
+EXPOSE 8080
+ENTRYPOINT ["java","-jar","jams-launcher.jar"]
diff --git a/README.md b/README.md
index e9ad003e..cebfaa01 100644
--- a/README.md
+++ b/README.md
@@ -32,4 +32,19 @@ and install it from source.
To build the documentation, change enter the ``jams-server`` directory and simply run:
-```apidoc -i src/ -o doc/```
\ No newline at end of file
+```apidoc -i src/ -o doc/```
+
+##### Building the Docker container
+
+You can build the docker container using:
+
+```
+docker build -f Dockerfile -t jams:latest .
+```
+
+To run the docker container (assuming you want to have it on port 80 locally):
+
+```
+docker run -p 80:8080 --rm jams:latest
+```
+
diff --git a/ad-connector/pom.xml b/ad-connector/pom.xml
index f2a73753..a3d1db25 100644
--- a/ad-connector/pom.xml
+++ b/ad-connector/pom.xml
@@ -15,7 +15,7 @@
<groupId>net.jami</groupId>
<artifactId>jams-common</artifactId>
<version>${revision}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<artifactId>ddc-core</artifactId>
diff --git a/authentication-module/pom.xml b/authentication-module/pom.xml
index 97db28fb..8488c454 100644
--- a/authentication-module/pom.xml
+++ b/authentication-module/pom.xml
@@ -15,7 +15,7 @@
<groupId>net.jami</groupId>
<artifactId>jams-common</artifactId>
<version>${revision}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.jami</groupId>
diff --git a/datastore/pom.xml b/datastore/pom.xml
index d197f3ec..c1582584 100644
--- a/datastore/pom.xml
+++ b/datastore/pom.xml
@@ -15,7 +15,7 @@
<groupId>net.jami</groupId>
<artifactId>jams-common</artifactId>
<version>${revision}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
diff --git a/jami-dht/pom.xml b/jami-dht/pom.xml
index af19fca0..b6d0e30b 100644
--- a/jami-dht/pom.xml
+++ b/jami-dht/pom.xml
@@ -26,7 +26,7 @@
<groupId>net.jami</groupId>
<artifactId>jams-common</artifactId>
<version>${revision}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/jami-nameserver/pom.xml b/jami-nameserver/pom.xml
index 1e7327f7..1adfba70 100644
--- a/jami-nameserver/pom.xml
+++ b/jami-nameserver/pom.xml
@@ -15,13 +15,13 @@
<groupId>net.jami</groupId>
<artifactId>jams-common</artifactId>
<version>${revision}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.jami</groupId>
<artifactId>datastore</artifactId>
<version>${revision}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/jams-ca/pom.xml b/jams-ca/pom.xml
index d6003640..e19bde72 100644
--- a/jams-ca/pom.xml
+++ b/jams-ca/pom.xml
@@ -15,7 +15,7 @@
<groupId>net.jami</groupId>
<artifactId>jams-common</artifactId>
<version>${revision}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
diff --git a/jams-common/pom.xml b/jams-common/pom.xml
index 69dc9488..45d3f787 100644
--- a/jams-common/pom.xml
+++ b/jams-common/pom.xml
@@ -40,7 +40,7 @@
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
- <version>8.17</version>
+ <version>${nimbus.jwt.version}</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/jams-server/pom.xml b/jams-server/pom.xml
index 5bd4a31c..96b1ffb0 100644
--- a/jams-server/pom.xml
+++ b/jams-server/pom.xml
@@ -64,7 +64,7 @@
<dependency>
<groupId>net.jami</groupId>
<artifactId>authentication-module</artifactId>
- <version>2.0</version>
+ <version>${revision}</version>
<scope>compile</scope>
</dependency>
</dependencies>
diff --git a/jams-server/src/main/java/net/jami/jams/server/core/TomcatConnectorFactory.java b/jams-server/src/main/java/net/jami/jams/server/core/TomcatConnectorFactory.java
index 6ac48c34..a219f4ae 100644
--- a/jams-server/src/main/java/net/jami/jams/server/core/TomcatConnectorFactory.java
+++ b/jams-server/src/main/java/net/jami/jams/server/core/TomcatConnectorFactory.java
@@ -47,6 +47,7 @@ public class TomcatConnectorFactory {
SSLHostConfig sslConfig = new SSLHostConfig();
SSLHostConfigCertificate sslHostConfigCertificate = new SSLHostConfigCertificate(sslConfig, SSLHostConfigCertificate.Type.RSA);
sslHostConfigCertificate.setCertificateChainFile(System.getProperty("user.dir") + File.separator + certificateFile);
+ sslHostConfigCertificate.setCertificateFile(System.getProperty("user.dir") + File.separator + certificateFile);
sslHostConfigCertificate.setCertificateKeyFile(System.getProperty("user.dir") + File.separator + keyFile);
sslConfig.addCertificate(sslHostConfigCertificate);
sslConfig.setProtocols("TLSv1,TLSv1.2,TLSv1.3");
diff --git a/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/user/UserServlet.java b/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/user/UserServlet.java
index c6737c08..6c725590 100644
--- a/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/user/UserServlet.java
+++ b/jams-server/src/main/java/net/jami/jams/server/servlets/api/auth/user/UserServlet.java
@@ -73,7 +73,7 @@ public class UserServlet extends HttpServlet {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
StatementList select = new StatementList();
- StatementElement st = new StatementElement("username","=",req.getParameter("username"),"");
+ StatementElement st = new StatementElement("username","=",req.getAttribute("username").toString(),"");
select.addStatement(st);
User user = dataStore.getUserDao().getObjects(select).get(0);
String password = user.getPassword();
diff --git a/ldap-connector/pom.xml b/ldap-connector/pom.xml
index 59b4b270..9c87c3bc 100644
--- a/ldap-connector/pom.xml
+++ b/ldap-connector/pom.xml
@@ -16,7 +16,7 @@
<groupId>net.jami</groupId>
<artifactId>jams-common</artifactId>
<version>${revision}</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ldaptive</groupId>
diff --git a/server.key b/server.key
deleted file mode 100644
index 40c109d8..00000000
--- a/server.key
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PRIVATE KEY-----
-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
-iwFJQL0Kz83sSeVFfBHDpK/Sckx3
------END PRIVATE KEY-----
diff --git a/server.pem b/server.pem
deleted file mode 100644
index 706489d2..00000000
--- a/server.pem
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFnzCCA4egAwIBAgIUXZ3/FHcJwGzw9ad1kqmpy4/zTKcwDQYJKoZIhvcNAQEL
-BQAwXzELMAkGA1UEBhMCQ0ExCzAJBgNVBAgMAlFDMREwDwYDVQQHDAhNb250cmVh
-bDENMAsGA1UECgwEVEVTVDENMAsGA1UECwwEVEVTVDESMBAGA1UEAwwJbG9jYWxo
-b3N0MB4XDTIwMDYxODEzMDkwOFoXDTIxMDYxODEzMDkwOFowXzELMAkGA1UEBhMC
-Q0ExCzAJBgNVBAgMAlFDMREwDwYDVQQHDAhNb250cmVhbDENMAsGA1UECgwEVEVT
-VDENMAsGA1UECwwEVEVTVDESMBAGA1UEAwwJbG9jYWxob3N0MIICIjANBgkqhkiG
-9w0BAQEFAAOCAg8AMIICCgKCAgEAtO6SP2Q0HB3q0lD/D/Igfd8Thv0vjsFDj+H0
-bGkM30pfw8RWCVWbiqqxFCyw91YB820PDUXCLDRQpuZSHwHDyAHQ/Amw4eiZt0VC
-RkcDy8Wmk+6mIs6uwihdqSwsCA7Ad8k3MTfy4dQuNfNxQfP91qVqwaLNbtdDk0Ud
-QGQjy2XwjqKKCqhR/mlYH2MhMjN2XaaLuDDCZa9O3SIW0GDjlUebwvK25tu4L5nc
-SvrwN9v+RtTwAiYYktp7oto0853xycRS5dgRqLiLkR8ZNp6xe1+HtHHgP5lwhMYD
-wVjLdSFFd3yMCEd/Hv7Mso3zdwGkFpx8UxhRrPaZ2s0Hg131hVi3wfmOm8oTWeYd
-pnuRJApmXO49VV0Uptt8HEZaufVMAN1i+x1x437bVX/thbyPUieD0IPh/o2n/FdF
-jktwN0X2MSWRgLXxiDt6u57Sy8CczKaleHei/Nyg7RRHc/p0aCRRFcvmafX9Crxq
-/ZOGsFzu2dxDWMEYEJosBUxaJYMmxo1u4wUy7M+zJrz7elY1W1rSnKfRr4knE0mJ
-wzTLnolzBqiZoo/8Te4SS7MC0JxoEeMrDB2WZKyHDQgSgw7CE4rMNIVj+tFBg7TY
-DTbS/uP5HJHAVqCi65fqb4k+GsfwZ1uy1dlWBg3WMpfvsnWo4B3aDbm0SUJc4ixV
-4Z1r2zECAwEAAaNTMFEwHQYDVR0OBBYEFMzPJbDc8A8bbyznB/Gg9VDnUu/dMB8G
-A1UdIwQYMBaAFMzPJbDc8A8bbyznB/Gg9VDnUu/dMA8GA1UdEwEB/wQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggIBAKKCbGlSTCd66lZTfQKlxGk7EC+j7O9fupaNwXCm
-wfdtnEArOumHEdBQdbCfnnfNWO01lUXheI6iN8zOX66y7zoHwqJF4gvdQL8xPC0S
-PvQ3kZWuQqjiH3N0jB1NMKCWloo7SyUgSSbLAmyFfTlIBYv6NuysBPZ4LDLIqbUx
-xXdkW2sR7UXPTar+UBKtNI7FzM9fBIbHuk/JjB9XOJbjBuFED9tF0OofL8wVkCzG
-bhGw1zZ8wf0rFmWqNmxkFzYXXsZQzmQd1UCwnZ2/IsRoxLO5GJp4CuEnO2G6ayU2
-BPU+3Vl2BEcvQFpApwuSbYIa/B9LrXhcEkMwez4pbIQR3X1fWZ6CDyDsQdNse+sF
-C9w/iTlclPMB9W5J391GJZWXbtp2+gWFsDhjERuvluixJtL+h4Z4ADbERXZoFs5l
-AHD5W3zIgPm6PpJ9hBH28LwwyV939ucUJlhpUXAuHfINe8OzqAR2NcVIggBq53Z8
-4YxFEtA+PvKxYd1rLbozo7078rBiYiGPxYX8wvvkkbAlSgzwKmJaovV0YtvyrpRL
-S7BjzW80Scq1qHxEsGRJ5yaavx+JlefMw3gU8VjI2ilnYNlMNOZh7dRm4eCRcUwc
-3rsTIOoEXDvtrQHsq8xRVi/RwRhBNjrhg5+dKIMxBpHFa8uFyzIyhVOnY2tgRaHX
-UHgl
------END CERTIFICATE-----
diff --git a/webapp/index.php b/webapp/index.php
deleted file mode 100644
index c37615a1..00000000
--- a/webapp/index.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-phpinfo();
-?>
--
GitLab