org.forgerock / org.forgerock.opendj

26 Mar, 2013

11 commits

d3d3398b CR-1475 Fix for OPENDJ-829: Document how to configure the commons REST based HTTP connection handler ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@8653 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
mark
2013-03-26 17:42:11 +0000

3a777c4e OPENDJ-832 Leverage the work queue for processing requests received on the HTTP connection handler ... Browse Code »

Code cleanup: More AbstractOperation => Operation.
Converted java comments to javadocs.
Added @Override annotations.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8652 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-26 16:57:29 +0000

4099e2a5 OPENDJ-832 Leverage the work queue for processing requests received on the HTTP connection handler ... Browse Code »

Code cleanup: Changed code from using AbstractOperation abstract class to using Operation interface instead.



Operation.java
Now extends Runnable.

OperationWrapper.java
Consequence of the change to Operation.java.


WorkQueue.java:
In submitOperation(), used Operation interface instead of AbstractOperation abstract class.

DirectoryServer.java:
In enqueueRequest() used Operation interface instead of AbstractOperation abstract class.
Removed CLASS_NAME constant, used this class's name in getClassName().

ParallelWorkerThread.java:
Changed instance member operation from AbstractOperation abstract class to Operation interface.

ParallelWorkQueue.java:
Changed instance member opQueue from ConcurrentLinkedQueue<AbstractOperation> to ConcurrentLinkedQueue<Operation>.
In submitOperation(), nextOperation() and retryNextOperation(), used Operation interface instead of AbstractOperation abstract class.

TraditionalWorkerThread.java
Changed instance member operation from AbstractOperation abstract class to Operation interface.
In shutDown() used Operation interface instead of AbstractOperation abstract class.

TraditionalWorkQueue.java
Changed instance member opQueue from LinkedBlockingQueue<AbstractOperation> to LinkedBlockingQueue<Operation>.
In initializeWorkQueue(), submitOperation(), nextOperation(), retryNextOperation() and applyConfigurationChange(), used Operation interface instead of AbstractOperation abstract class.
In applyConfigurationChange(), remove a duplicate condition check.



All files:
Converted java comments to javadocs.
Added @Override annotations.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8651 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-26 14:49:27 +0000

98904915 Converters.java: Made all static final methods public static (static methods are… ... Browse Code »

… always final anyway). opendj-rest2ldap-servlet: svn ignored eclipse generated files.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8650 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-26 13:22:49 +0000

d9a63494 CR-1472 Fix OPENDJ-823 Authz users forced to change their password shouldn't be … ... Browse Code »
```
…able to modify entries

git-svn-id: https://svn.forgerock.org/opendj/trunk@8649 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
cjr
2013-03-26 13:22:14 +0000
5a881348 OPENDJ-832 Leverage the work queue for processing requests received on the HTTP connection handler ... Browse Code »
```
Fixing build with precommit.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8648 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-03-26 13:01:11 +0000

aec55e98 OPENDJ-832 Leverage the work queue for processing requests received on the HTTP connection handler ... Browse Code »

Renamed StaticUtils.java to Converters.java. Did the same for the test.
Added javadocs to Converters.java .

Adapters.java:
Consequence of the change to Converters.java .

git-svn-id: https://svn.forgerock.org/opendj/trunk@8647 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-26 11:46:31 +0000

e10ffccd CR-1474 Fix for OPENDJ-814: Document improvement to escape characters in make-ldif templates ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@8646 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
mark
2013-03-26 11:23:13 +0000
5c8317b1 'with with' => 'with' ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@8645 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-03-26 09:57:11 +0000

57770c57 OPENDJ-808 Implement a simple commons REST based HTTP connection handler ... Browse Code »

HTTPConnectionHandlerConfiguration.xml:
Removed the advanced attribute from ds-cfg-config-file property. This should be accessible from normal use.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8644 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-26 09:38:01 +0000

0e047855 OPENDJ-816 (CR-1460) ssf bug in ACI evaluation? ... Browse Code »
```
Fixing nightly build.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8643 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-03-26 08:09:04 +0000

25 Mar, 2013

11 commits

42f87e02 Fix CREST-77: Expose JSON field name constants for HTTP servlet parameters and result fields ... Browse Code »

* expose all headers as constants in their respective request/response class
* rename Request.getFieldFilters to Request.getFields to align with REST API
* rename REST query parameter "_filter" to "_queryFilter" to align with Java API


git-svn-id: https://svn.forgerock.org/opendj/trunk@8642 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-25 18:38:08 +0000

9764b471 Fix OPENDJ-833: Fix OSGi integration for OpenDJ LDAP SDK and sub-modules ... Browse Code »
```
Thanks to Laszlo for the patch.


git-svn-id: https://svn.forgerock.org/opendj/trunk@8641 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-03-25 17:40:53 +0000

a395210f Additional fix for OPENDJ-694: Implement HTTP BASIC authentication ... Browse Code »

* update sample JSON config to use search+simple
* add some additional documentation


git-svn-id: https://svn.forgerock.org/opendj/trunk@8640 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-25 13:37:53 +0000

64964658 Additional fix for OPENDJ-694: Implement HTTP BASIC authentication ... Browse Code »

* don't use ServletRequest.getServletContext() since it is Servlet 3 only


git-svn-id: https://svn.forgerock.org/opendj/trunk@8639 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-25 13:37:00 +0000

283f541d OPENDJ-808 Implement a simple commons REST based HTTP connection handler ... Browse Code »

Added support for using the Rest2LDAP servlet from OpenDJ HTTPConnectionHandler.



HTTPConnectionHandler.java:
Added support for using the Rest2LDAP servlet + removed the FakeServlet.
Added the JSON_MAPPER constant to parse the JSON config file for Rest2LDAP.
Added getClientConnectionsMap() getter.
Added getConnectionFactory() method, heavily inspired from org.forgerock.opendj.rest2ldap.servlet.Rest2LDAPConnectionFactoryProvider.getConnectionFactory().
In startHttpServer(), silenced Grizzly logging + set the IOThreadStrategy to be single threaded + changed the access path to the servlet.

CollectClientConnectionsFilter.java:
Added support for using the Rest2LDAP servlet.
Removed clientConnections instance member, now get this value from the HTTPConnectionHandler.

config.ldif, 02-config.ldif, HTTPConnectionHandlerConfiguration.xml, HTTPConnectionHandlerCfgDefn.properties:
Added ds-cfg-config-file property to ds-cfg-http-connection-handler objectClass.

http-config.json: ADDED (copied from opendj-rest2ldap-servlet project)


ivy.xml:
Added dependencies to Rest2LDAP.

ivysettings.xml:
Added support for updating SNAPSHOTS.


git-svn-id: https://svn.forgerock.org/opendj/trunk@8638 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-25 11:58:10 +0000

d599a134 Code cleanup. ... Browse Code »

InternalClientConnection.java:
Removed redundant code that duplicates work already done by AbstractOperation's constructor.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8637 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-25 11:54:15 +0000

3155ee23 Partial fix for OPENDJ-694: Implement HTTP BASIC authentication ... Browse Code »

* add support for SASL PLAIN authentication
* add support for Search + Simple Bind authentication
* switch config file over to Search + Simple Bind authentication since this is the common use case.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8636 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-25 11:05:34 +0000

2e857ee1 Simple fix: avoid appending redundant ":" to ErrorResultException error message … ... Browse Code »
```
…when there is no LDAP diagnostic message.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8635 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-03-25 11:04:10 +0000
31ca4ede OPENDJ-816 (CR-1460) ssf bug in ACI evaluation? ... Browse Code »
```
Fixing build.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8634 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-03-25 10:11:21 +0000
b95b359b OPENDJ-816 (CR-1460) ssf bug in ACI evaluation? ... Browse Code »
```
Fixing build.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8633 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-03-25 09:19:14 +0000

022bc2d5 OPENDJ-816 (CR-1460) ssf bug in ACI evaluation? ... Browse Code »

TLSByteChannel.java:
Extracted static method getSSF() to allow testing.
Modified CIPHER_MAP: added WITH_ARIA_256, WITH_ARIA_128
+ removed the modes of operation CBC and GCM at the end of some cipher names
+ removed subsequent duplicates, sorted by SSF size descending (moved WITH_3DES_EDE)
+ fixed overlapping bug with WITH_DES and WITH_DES_CBC_40.

TLSByteChannelTestCase.java: ADDED


git-svn-id: https://svn.forgerock.org/opendj/trunk@8632 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-25 08:53:54 +0000

23 Mar, 2013

1 commit

613f8ed2 Partial fix for OPENDJ-694: Implement HTTP BASIC authentication ... Browse Code »

* json-resource-servlet - refactor Servlet 2.x / 3.x abstraction layer so that it can be reused in the LDAP authentication filter
* opendj-rest2ldap-servlet - add preliminary support for performing LDAP simple bind based authentication.


git-svn-id: https://svn.forgerock.org/opendj/trunk@8631 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-23 01:46:37 +0000

22 Mar, 2013

3 commits

973f89ff CR-1459 Update svn properties, snmp tests and add a script to merge tests results ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@8630 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
csovant
2013-03-22 17:33:01 +0000
10ffb6f2 CR-1449 Fix for OPENDJ-748: Describe what to do if a key has been compromised ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@8629 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
mark
2013-03-22 15:50:35 +0000

fbbf4a66 Partial fix for OPENDJ-694: Implement HTTP BASIC authentication ... Browse Code »

* make authorization policy configuration more user friendly and explicit.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8628 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-22 13:01:05 +0000

21 Mar, 2013

7 commits

4a1135f2 Partial fix for OPENDJ-694: Implement HTTP BASIC authentication ... Browse Code »

* allow and add comments in the sample JSON configuration
* add sample authentication configuration to JSON configuration
* put all servlet related configuration in a separate element
* add support for authzId templates where the template is of the form "dn:{xxx}"


git-svn-id: https://svn.forgerock.org/opendj/trunk@8627 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-21 18:04:28 +0000

3ed827c4 Updated svn:ignore property ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@8626 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-03-21 14:14:46 +0000

e0882578 OPENDJ-808 Implement a simple commons REST based HTTP connection handler ... Browse Code »

build.xml:
By popular demand, stripped out the version number from the jars under the lib directory. This way, they now have a stable location, whatever the version they are on.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8625 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-21 13:43:33 +0000

6bde891b Partial fix for OPENDJ-694: Implement HTTP BASIC authentication ... Browse Code »
```
* fix Javadoc typo in previous commit.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8624 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-03-21 12:06:21 +0000

5283a844 Partial fix for OPENDJ-694: Implement HTTP BASIC authentication ... Browse Code »

* implement a new HttpServletContextFactory which allows authentication modules to pass in pre-authenticated LDAP connection to lower Rest2LDAP layers for use when performing LDAP operations.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8623 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-21 12:04:24 +0000

1ac5a7db OPENDJ-808 Implement a simple commons REST based HTTP connection handler ... Browse Code »

ConcurrentHashMap does not accept putting in null values, so I will put in the key itself (It is redundant, but this is not a problem here.)

HTTPConnectionHandler.java:
clientConnections changed from Map<ClientConnection, Void> to Map<ClientConnection, ClientConnection>.

CollectClientConnectionsFilter.java:
Consequence  of the change to HTTPConnectionHandler. 
Use the key to put in the value.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8622 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-21 11:43:51 +0000

ca1c4f4a Partial fix for OPENDJ-694: Implement HTTP BASIC authentication ... Browse Code »

* add support for using proxied authorization control
* add support for re-using connections obtained during authentication (e.g. in authentication servlet filter)
* refactored JSON config to allow configuration of multiple connection factories.

git-svn-id: https://svn.forgerock.org/opendj/trunk@8621 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-21 08:42:44 +0000

20 Mar, 2013

7 commits

d5cc402e Disable http connection handler by default. Not ready to be used yet. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@8620 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
ludo
2013-03-20 20:19:54 +0000

573c76bd OPENDJ-808 Implement a simple commons REST based HTTP connection handler ... Browse Code »

Fixed the issues identified with r8615.

ivy.xml:
Use the latest of Grizzly.
Use very specifically javax.servlet-api 3.1-b02 to ensure compatibility with java 6.

HTTPConnectionHandler.java:
Uncommented all the code that I previously commented to allow code to compile on Jenkins.


git-svn-id: https://svn.forgerock.org/opendj/trunk@8619 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-20 17:12:17 +0000

bc248b7a Removed an odd dependency to grizzly-project ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@8618 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
JnRouvignac
2013-03-20 15:17:25 +0000
215faffb One line fix: reduce scope of JE dependency to testing. ... Browse Code »
```
git-svn-id: https://svn.forgerock.org/opendj/trunk@8616 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
matthew
2013-03-20 14:11:02 +0000

0bf9b237 OPENDJ-808 Implement a simple commons REST based HTTP connection handler ... Browse Code »

Made the code compile with java 6 until we can further solve the issue.
I'll come back to this code to uncomment the lines I commented here.

ivy.xml:
Excluded the dependency to activation.jar.
Remporarily downgraded grizzly and javax.servlet versions.
Replaced tabs with spaces.

HTTPConnectionHandler.java:
Commented out some code to be reenabled in a subsequent commit.


git-svn-id: https://svn.forgerock.org/opendj/trunk@8615 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-20 11:23:47 +0000

e525bd15 CR-1426 Fix for OPENDJ-798: Cannot be part of 2 replication topologies if a thir… ... Browse Code »
```
…d topology shares a common suffix

git-svn-id: https://svn.forgerock.org/opendj/trunk@8614 41b1ffd8-f28e-4786-ab96-9950f0a78031
```
mark
2013-03-20 09:27:57 +0000

f0693aec OPENDJ-808 Implement a simple commons REST based HTTP connection handler ... Browse Code »

Added the HTTPConnnectionHandler implemented using Grizzly.
Added support for all configuration similar to the LDAPConnectionHandler.
Missing support for ds-cfg-keep-stats and ds-cfg-num-request-handlers.


config.ldif, 02-config.ldif:
Added new entry for HTTP connection handler + defaults.

HTTPConnectionHandlerCfgDefn.properties, HTTPConnectionHandlerConfiguration.xml: ADDED

LDAPConnectionHandlerConfiguration.xml:
Moved properties common to HTTPConnectionHandlerConfiguration.xml to Package.xml .

protocol*.properties:
Merged protocol messages between LDAP, HTTP and JMX. Made them non LDAP specific.
Added 2 new protocol messages for HTTP.


CollectClientConnectionsFilter.java, HTTPClientConnection.java, HTTPConnectionHandler.java, package-info.java: ADDED

JmxClientConnection.java, JmxConnectionHandler.java, LDAPClientConnection.java:
Used common protocol messages.

LDAPConnectionHandler.java
Used common protocol messages.
Extracted method configureSSL()
Simplified the code in getEnabledSSLCipherSuites() and getEnabledSSLProtocols() and protected against a multi threaded change ofg the SSL engine by using a local copy.



git-svn-id: https://svn.forgerock.org/opendj/trunk@8613 41b1ffd8-f28e-4786-ab96-9950f0a78031

2013-03-20 08:58:11 +0000