You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2018/04/18 23:04:47 UTC
[directory-ldap-api] 01/01: created a 1.0.1 branch for some fixes
This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch 1.0.1
in repository https://gitbox.apache.org/repos/asf/directory-ldap-api.git
commit 5abc14a9a2903b5a26543596cfceb4723383c2d2
Author: Emmanuel Lécharny <el...@symas.com>
AuthorDate: Thu Apr 19 01:04:40 2018 +0200
created a 1.0.1 branch for some fixes
---
all/pom.xml | 2 +-
asn1/api/pom.xml | 2 +-
asn1/ber/pom.xml | 2 +-
asn1/pom.xml | 2 +-
distribution/pom.xml | 2 +-
dsml/engine/pom.xml | 2 +-
dsml/parser/pom.xml | 2 +-
dsml/pom.xml | 2 +-
i18n/pom.xml | 2 +-
integ-osgi/pom.xml | 2 +-
integ-osgi2/pom.xml | 2 +-
integ/pom.xml | 2 +-
ldap/client/all/pom.xml | 2 +-
ldap/client/api/pom.xml | 2 +-
.../apache/directory/ldap/client/api/LdapNetworkConnection.java | 9 ++++++++-
ldap/client/pom.xml | 2 +-
ldap/codec/core/pom.xml | 2 +-
ldap/codec/pom.xml | 2 +-
ldap/codec/standalone/pom.xml | 2 +-
ldap/extras/aci/pom.xml | 2 +-
ldap/extras/codec-api/pom.xml | 2 +-
ldap/extras/codec/pom.xml | 2 +-
ldap/extras/pom.xml | 2 +-
ldap/extras/sp/pom.xml | 2 +-
ldap/extras/trigger/pom.xml | 2 +-
ldap/extras/util/pom.xml | 2 +-
ldap/model/pom.xml | 2 +-
ldap/net/mina/pom.xml | 2 +-
ldap/net/pom.xml | 2 +-
ldap/pom.xml | 2 +-
ldap/schema/converter/pom.xml | 2 +-
ldap/schema/data/pom.xml | 2 +-
ldap/schema/pom.xml | 2 +-
pom.xml | 2 +-
util/pom.xml | 2 +-
35 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/all/pom.xml b/all/pom.xml
index ec19345..a9cac03 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-all</artifactId>
diff --git a/asn1/api/pom.xml b/asn1/api/pom.xml
index 69d5ec0..8db3203 100644
--- a/asn1/api/pom.xml
+++ b/asn1/api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-asn1-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-asn1-api</artifactId>
diff --git a/asn1/ber/pom.xml b/asn1/ber/pom.xml
index 2eedb79..a7004ee 100644
--- a/asn1/ber/pom.xml
+++ b/asn1/ber/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-asn1-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-asn1-ber</artifactId>
diff --git a/asn1/pom.xml b/asn1/pom.xml
index 84796b2..afb1175 100644
--- a/asn1/pom.xml
+++ b/asn1/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-asn1-parent</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index bc5155c..868beb3 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>apache-ldap-api</artifactId>
diff --git a/dsml/engine/pom.xml b/dsml/engine/pom.xml
index 79f521b..5069f55 100644
--- a/dsml/engine/pom.xml
+++ b/dsml/engine/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-dsml-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-dsml-engine</artifactId>
diff --git a/dsml/parser/pom.xml b/dsml/parser/pom.xml
index 5607e74..19edb5d 100644
--- a/dsml/parser/pom.xml
+++ b/dsml/parser/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-dsml-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-dsml-parser</artifactId>
diff --git a/dsml/pom.xml b/dsml/pom.xml
index ae3ad3c..d6f6635 100644
--- a/dsml/pom.xml
+++ b/dsml/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-dsml-parent</artifactId>
diff --git a/i18n/pom.xml b/i18n/pom.xml
index 6bc939d..e28d515 100644
--- a/i18n/pom.xml
+++ b/i18n/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-i18n</artifactId>
diff --git a/integ-osgi/pom.xml b/integ-osgi/pom.xml
index 54d362c..2f75fd9 100644
--- a/integ-osgi/pom.xml
+++ b/integ-osgi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-integ-osgi</artifactId>
diff --git a/integ-osgi2/pom.xml b/integ-osgi2/pom.xml
index ba5f12b..c86c280 100644
--- a/integ-osgi2/pom.xml
+++ b/integ-osgi2/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-integ-osgi2</artifactId>
diff --git a/integ/pom.xml b/integ/pom.xml
index ac1e89a..b7b3a18 100644
--- a/integ/pom.xml
+++ b/integ/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-integ</artifactId>
diff --git a/ldap/client/all/pom.xml b/ldap/client/all/pom.xml
index a6e464b..ebbbabe 100644
--- a/ldap/client/all/pom.xml
+++ b/ldap/client/all/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-client-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-client-all</artifactId>
diff --git a/ldap/client/api/pom.xml b/ldap/client/api/pom.xml
index dd455ce..2c135cb 100644
--- a/ldap/client/api/pom.xml
+++ b/ldap/client/api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-client-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-client-api</artifactId>
diff --git a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
index d12f44b..07dfe35 100644
--- a/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
+++ b/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
@@ -4040,7 +4040,7 @@ public class LdapNetworkConnection extends AbstractLdapConnection implements Lda
}
// for LDAPS
- if ( ldapSession == null )
+ if ( ( ldapSession == null ) || !connected.get() )
{
connector.getFilterChain().addFirst( SSL_FILTER_KEY, sslFilter );
}
@@ -4241,6 +4241,13 @@ public class LdapNetworkConnection extends AbstractLdapConnection implements Lda
*/
private void writeRequest( Request request ) throws LdapException
{
+ // If we are meant to be using a secure connection but the ssl filter isn' in the filter chain then
+ // throw immediately
+ if ( config.isUseSsl() && !ldapSession.isSecured() )
+ {
+ throw new InvalidConnectionException( "Attempting to send over an insecure connection" );
+ }
+
// Send the request to the server
WriteFuture writeFuture = ldapSession.write( request );
diff --git a/ldap/client/pom.xml b/ldap/client/pom.xml
index f8f2032..7903efb 100644
--- a/ldap/client/pom.xml
+++ b/ldap/client/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-client-parent</artifactId>
diff --git a/ldap/codec/core/pom.xml b/ldap/codec/core/pom.xml
index 7ebba0d..c640080 100644
--- a/ldap/codec/core/pom.xml
+++ b/ldap/codec/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-codec-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-codec-core</artifactId>
diff --git a/ldap/codec/pom.xml b/ldap/codec/pom.xml
index ce2e4c9..8717db4 100644
--- a/ldap/codec/pom.xml
+++ b/ldap/codec/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-codec-parent</artifactId>
diff --git a/ldap/codec/standalone/pom.xml b/ldap/codec/standalone/pom.xml
index be1d624..a04bea8 100644
--- a/ldap/codec/standalone/pom.xml
+++ b/ldap/codec/standalone/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-codec-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-codec-standalone</artifactId>
diff --git a/ldap/extras/aci/pom.xml b/ldap/extras/aci/pom.xml
index 25d58bc..c93c809 100644
--- a/ldap/extras/aci/pom.xml
+++ b/ldap/extras/aci/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-extras-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-extras-aci</artifactId>
diff --git a/ldap/extras/codec-api/pom.xml b/ldap/extras/codec-api/pom.xml
index f97caac..f94e5e6 100644
--- a/ldap/extras/codec-api/pom.xml
+++ b/ldap/extras/codec-api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-extras-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-extras-codec-api</artifactId>
diff --git a/ldap/extras/codec/pom.xml b/ldap/extras/codec/pom.xml
index 42b1a99..f495983 100644
--- a/ldap/extras/codec/pom.xml
+++ b/ldap/extras/codec/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-extras-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-extras-codec</artifactId>
diff --git a/ldap/extras/pom.xml b/ldap/extras/pom.xml
index c624dfb..cc67f5e 100644
--- a/ldap/extras/pom.xml
+++ b/ldap/extras/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-extras-parent</artifactId>
diff --git a/ldap/extras/sp/pom.xml b/ldap/extras/sp/pom.xml
index 2fc0a9a..4d509fb 100644
--- a/ldap/extras/sp/pom.xml
+++ b/ldap/extras/sp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-extras-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-extras-sp</artifactId>
diff --git a/ldap/extras/trigger/pom.xml b/ldap/extras/trigger/pom.xml
index 7ee6602..25750ac 100644
--- a/ldap/extras/trigger/pom.xml
+++ b/ldap/extras/trigger/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-extras-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-extras-trigger</artifactId>
diff --git a/ldap/extras/util/pom.xml b/ldap/extras/util/pom.xml
index dd8775b..34e99b9 100644
--- a/ldap/extras/util/pom.xml
+++ b/ldap/extras/util/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-extras-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-extras-util</artifactId>
diff --git a/ldap/model/pom.xml b/ldap/model/pom.xml
index 52084aa..67f4d15 100644
--- a/ldap/model/pom.xml
+++ b/ldap/model/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-model</artifactId>
diff --git a/ldap/net/mina/pom.xml b/ldap/net/mina/pom.xml
index 7db9f4e..a0763dc 100644
--- a/ldap/net/mina/pom.xml
+++ b/ldap/net/mina/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-net-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-net-mina</artifactId>
diff --git a/ldap/net/pom.xml b/ldap/net/pom.xml
index 97cd65d..6b60b0c 100644
--- a/ldap/net/pom.xml
+++ b/ldap/net/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-net-parent</artifactId>
diff --git a/ldap/pom.xml b/ldap/pom.xml
index 32131d3..ff37c68 100644
--- a/ldap/pom.xml
+++ b/ldap/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-parent</artifactId>
diff --git a/ldap/schema/converter/pom.xml b/ldap/schema/converter/pom.xml
index ca88b28..1c20a09 100644
--- a/ldap/schema/converter/pom.xml
+++ b/ldap/schema/converter/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-schema-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-schema-converter</artifactId>
diff --git a/ldap/schema/data/pom.xml b/ldap/schema/data/pom.xml
index d8da4f1..c4d9e65 100644
--- a/ldap/schema/data/pom.xml
+++ b/ldap/schema/data/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-schema-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-schema-data</artifactId>
diff --git a/ldap/schema/pom.xml b/ldap/schema/pom.xml
index f71c903..1d0515f 100644
--- a/ldap/schema/pom.xml
+++ b/ldap/schema/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-ldap-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-ldap-schema-parent</artifactId>
diff --git a/pom.xml b/pom.xml
index acc7ef8..24e169a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
<artifactId>api-parent</artifactId>
<name>Apache Directory LDAP API</name>
<packaging>pom</packaging>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<properties>
<additionalparam>-Xdoclint:none</additionalparam>
diff --git a/util/pom.xml b/util/pom.xml
index b0539d0..5268ebe 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</parent>
<artifactId>api-util</artifactId>
--
To stop receiving notification emails like this one, please contact
elecharny@apache.org.