Merge branch '1.0.5'

TremoloSecurity · Feb 6, 2019 · 33e6daa · 33e6daa
2 parents 3803bf6 + dbb26b0
commit 33e6daa
Show file tree

Hide file tree

Showing 32 changed files with 2,588 additions and 3,630 deletions.
diff --git a/.factorypath b/.factorypath
@@ -0,0 +1,32 @@
+<factorypath>
+    <factorypathentry kind="VARJAR" id="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-dbcp/commons-dbcp/1.4/commons-dbcp-1.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/jcifs/jcifs/1.3.17/jcifs-1.3.17.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/tremolosecurity/myvd/jldap/1.0.0/jldap-1.0.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/tremolosecurity/myvd/jdbcLdap/1.0.0/jdbcLdap-1.0.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/bouncycastle/bcprov-jdk15on/1.60/bcprov-jdk15on-1.60.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/bouncycastle/bcprov-ext-jdk15on/1.60/bcprov-ext-jdk15on-1.60.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/net/sf/ehcache/ehcache/2.10.6/ehcache-2.10.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/slf4j/slf4j-log4j12/1.7.25/slf4j-log4j12-1.7.25.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.11.1/log4j-api-2.11.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-core/2.11.1/log4j-core-2.11.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-1.2-api/2.11.1/log4j-1.2-api-2.11.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-io/commons-io/2.6/commons-io-2.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-collections/commons-collections/3.2.2/commons-collections-3.2.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-daemon/commons-daemon/1.1.0/commons-daemon-1.1.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-cli/commons-cli/1.4/commons-cli-1.4.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/commons-net/commons-net/3.6/commons-net-3.6.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/mchange/c3p0/0.9.5.2/c3p0-0.9.5.2.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/mchange/mchange-commons-java/0.2.11/mchange-commons-java-0.2.11.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/com/tremolosecurity/myvd/apacheds-service/2.0.0-M20/apacheds-service-2.0.0-M20.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/joda-time/joda-time/2.10.1/joda-time-2.10.1.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="VARJAR" id="M2_REPO/dnsjava/dnsjava/2.1.8/dnsjava-2.1.8.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,8 @@
 /build/
 /bin/
 target/
+.idea
+*.iml
 
 # OS Files #
 .DS_Store

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,41 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "java",
+            "name": "JUnit",
+            "request": "launch",
+            "cwd": "${workspaceRoot}",
+            "projectName": "myvd-server",
+            "mainClass": "org.junit.runner.JUnitCore",
+            "args": "net.sourceforge.myvd.test.join.TestJoin",
+            "sourcePaths": [
+              "${workspaceRoot}"
+            ],
+            "env": {
+
+                "PROJ_DIR":"/home/mlb/git/MyVirtualDirectory",
+                "SCHEMA_DIR":"/etc/openldap",
+                "SLAPD_PATH":"/usr/sbin",
+
+                "TMP_DIR":"/tmp/ldap"
+            },
+            "vmArgs" : "-Dlog4j.configurationFile=/home/mlb/git/OpenUnison/unison/open-unison-webapp/src/main/webapp/WEB-INF/classes/log4j2.xml"
+
+
+
+
+
+          },
+        {
+            "type": "java",
+            "name": "Debug (Attach)",
+            "request": "attach",
+            "hostName": "localhost",
+            "port": 5005
+        }
+    ]
+}
diff --git a/.vscode/launch.test.json b/.vscode/launch.test.json
@@ -0,0 +1,30 @@
+{
+    "run": {
+        "default": "",
+        "items": [
+            {
+                "name": "myvd-server",
+                "projectName": "myvd-server",
+                "workingDirectory": "/Users/mlb/git/MyVirtualDirectory",
+                "args": [],
+                "vmargs": [],
+                "env": {},
+                "preLaunchTask": ""
+            }
+        ]
+    },
+    "debug": {
+        "default": "",
+        "items": [
+            {
+                "name": "myvd-server",
+                "projectName": "myvd-server",
+                "workingDirectory": "/Users/mlb/git/MyVirtualDirectory",
+                "args": [],
+                "vmargs": [],
+                "env": {},
+                "preLaunchTask": ""
+            }
+        ]
+    }
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 1.0.5
+
+**tasks:**
+ - 1.0.5 Release [\#51](https://github.com/TremoloSecurity/MyVirtualDirectory/issues/51)
+
 # 1.0.4
 
 **enhancements:**

diff --git a/doc/myvd.asc b/doc/myvd.asc
@@ -263,10 +263,15 @@ port or both. To configure a non secure port simply supply a port
 number. In addition to the port number, you can specify a maximum number
 of entries or a maximum time limit (in milli-seconds). If not
 configured, the default is unlimited.
+The listener can be limited only on a particular host (default is `0.0.0.0`).
+If authentication is required the simple authentication credential are
+needed to bind the listener (default `false`).
 
 ....
 #Listen on port 389
+server.listener.host=localhost
 server.listener.port=389
+server.listener.authRequired=true
 server.listener.maxSizeLimit=1000
 server.listener.maxTimeLimit=60000
 ....
@@ -347,7 +352,9 @@ flow of data through the system. Namespaces are separated by LDAP DNs.
 Like the global namespace, local namespaces contain chains of inserts.
 Unlike the global namespaces, local namespaces are separated by an LDAP
 DN and a weight to determine which namespace takes priority when there
-is a conflict. To configure local namespaces:
+is a conflict.
+
+To configure local namespaces:
 
 ....
 #First, list all the namespaces
@@ -422,6 +429,33 @@ inserts.
 is because the routing insert in the global plugin explictly sets the
 namespace to be used.
 
+....
+#List all the namespaces
+server.namespaces=ns1,ns2
+
+#Configure the ns1 namespace
+server.ns1.chain=insert1
+server.ns1.nameSpace=ou=People,dc=mycomp1,dc=com
+server.ns1.weight=100
+server.ns1.enabled=true
+
+#Configure insert1
+server.ns1.insert1.className=com.package.class1
+server.ns1.insert1.config.option1=value1
+server.ns1.insert1.config.option2=value2
+
+#Configure the ns2 namespace
+server.ns2.chain=insert2
+server.ns2.nameSpace=ou=Users,dc=mycomp2,dc=org
+server.ns2.weight=100
+server.ns2.enabled=true
+
+#Configure insert2
+server.ns1.insert2.className=com.package.class2
+server.ns1.insert2.config.option1=value1
+server.ns1.insert2.config.option2=value2
+....
+
 [[complete-config]]
 Complete Config
 ^^^^^^^^^^^^^^^

diff --git a/myvd-server.iml b/myvd-server.iml
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>net.sourceforge.myvd</groupId>
 	<artifactId>myvd-server</artifactId>
-	<version>1.0.4</version>
+	<version>1.0.5</version>
 	<packaging>jar</packaging>
 
 	<name>server</name>
@@ -69,11 +69,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
+		<!-- <dependency>
 			<groupId>commons-httpclient</groupId>
 			<artifactId>commons-httpclient</artifactId>
 			<version>3.1</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
@@ -136,7 +136,7 @@
 		<dependency>
 			<groupId>net.sf.ehcache</groupId>
 			<artifactId>ehcache</artifactId>
-			<version>2.10.4</version>
+			<version>2.10.6</version>
 		</dependency>
 
 		<dependency>
@@ -160,17 +160,17 @@
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-api</artifactId>
-			<version>2.11.0</version>
+			<version>2.11.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>
-			<version>2.11.0</version>
+			<version>2.11.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-1.2-api</artifactId>
-			<version>2.11.0</version>
+			<version>2.11.1</version>
 		</dependency>
 
 
@@ -231,7 +231,7 @@
 		<dependency>
   		<groupId>joda-time</groupId>
   		<artifactId>joda-time</artifactId>
-  		<version>2.10</version>
+  		<version>2.10.1</version>
   	</dependency>
 	  <dependency>
     <groupId>dnsjava</groupId>
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ @@
     /build/
     /bin/
     target/
+    .idea
+    *.iml
     # OS Files #
     .DS_Store
@@ Expand Down @@