add explicit binding (#735)

* add explicit binding * fixup building on windows * reactivate unit test --------- Co-authored-by: Enrice <[email protected]>
sismics · Nov 10, 2023 · 45e00ac · 45e00ac
1 parent 80454af
commit 45e00ac
Show file tree

Hide file tree

Showing 5 changed files with 187 additions and 144 deletions.
diff --git a/docs-core/pom.xml b/docs-core/pom.xml
@@ -8,7 +8,7 @@
     <version>1.12-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
-  
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>docs-core</artifactId>
   <packaging>jar</packaging>
@@ -20,7 +20,7 @@
       <groupId>org.hibernate.orm</groupId>
       <artifactId>hibernate-core</artifactId>
     </dependency>
-    
+
     <!-- Other external dependencies -->
     <dependency>
       <groupId>joda-time</groupId>
@@ -31,12 +31,12 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -46,7 +46,7 @@
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-email</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
@@ -66,17 +66,17 @@
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
@@ -86,17 +86,17 @@
       <groupId>at.favre.lib</groupId>
       <artifactId>bcrypt</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-core</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-analyzers-common</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-queryparser</artifactId>
@@ -119,30 +119,35 @@
 
     <dependency>
       <groupId>org.apache.directory.api</groupId>
-      <artifactId>api-all</artifactId>
+      <artifactId>api-ldap-client-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.directory.api</groupId>
+      <artifactId>api-ldap-codec-standalone</artifactId>
     </dependency>
 
     <!-- Only there to read old index and rebuild them -->
     <dependency>
       <groupId>org.apache.lucene</groupId>
       <artifactId>lucene-backward-codecs</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.imgscalr</groupId>
       <artifactId>imgscalr-lib</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.apache.pdfbox</groupId>
       <artifactId>pdfbox</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk15on</artifactId>
     </dependency>
-    
+
     <dependency>
       <groupId>fr.opensagres.xdocreport</groupId>
       <artifactId>fr.opensagres.odfdom.converter.pdf</artifactId>
@@ -186,14 +191,14 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    
+
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
-  
+
   <profiles>
     <!-- Development profile (active by default) -->
     <profile>
@@ -205,7 +210,7 @@
           <value>dev</value>
         </property>
       </activation>
-      
+
       <build>
         <resources>
           <resource>
@@ -221,7 +226,7 @@
       <id>prod</id>
     </profile>
   </profiles>
-  
+
   <build>
     <resources>
       <resource>

diff --git a/...re/src/main/java/com/sismics/docs/core/util/authentication/LdapAuthenticationHandler.java b/...re/src/main/java/com/sismics/docs/core/util/authentication/LdapAuthenticationHandler.java
@@ -62,6 +62,7 @@ public User authenticate(String username, String password) {
             if (ldapConnection == null) {
                 return null;
             }
+            ldapConnection.bind();
 
             EntryCursor cursor = ldapConnection.search(ConfigUtil.getConfigStringValue(ConfigType.LDAP_BASE_DN),
                     ConfigUtil.getConfigStringValue(ConfigType.LDAP_FILTER).replace("USERNAME", username), SearchScope.SUBTREE);

diff --git a/docs-web/pom.xml b/docs-web/pom.xml
@@ -129,6 +129,12 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.directory.server</groupId>
+      <artifactId>apacheds-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
@@ -182,7 +188,7 @@
               </systemProperties>
               <webApp>
                 <contextPath>/docs-web</contextPath>
-                <overrideDescriptor>src/dev/main/webapp/web-override.xml</overrideDescriptor>
+                <overrideDescriptor>${project.basedir}/src/dev/main/webapp/web-override.xml</overrideDescriptor>
               </webApp>
             </configuration>
           </plugin>
@@ -260,8 +266,8 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-war-plugin</artifactId>
             <configuration>
-              <warSourceDirectory>${basedir}/src/main/webapp/dist</warSourceDirectory>
-              <webXml>src\main\webapp\WEB-INF\web.xml</webXml>
+              <warSourceDirectory>${project.basedir}/src/main/webapp/dist</warSourceDirectory>
+              <webXml>src/main/webapp/WEB-INF/web.xml</webXml>
             </configuration>
           </plugin>
         </plugins>