You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/06/21 09:12:53 UTC

[1/2] activemq-artemis git commit: ARTEMIS-579 document reload for JAAS modules

Repository: activemq-artemis
Updated Branches:
  refs/heads/master f10338a9b -> 372528d84


ARTEMIS-579 document reload for JAAS modules


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e1b6393f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e1b6393f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e1b6393f

Branch: refs/heads/master
Commit: e1b6393f70732bdadaa9df5058efbedb7883d824
Parents: f10338a
Author: jbertram <jb...@apache.org>
Authored: Mon Jun 20 13:40:30 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Mon Jun 20 13:41:09 2016 -0500

----------------------------------------------------------------------
 .../spi/core/security/jaas/TextFileCertificateLoginModule.java   | 4 ++--
 docs/user-manual/en/security.md                                  | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1b6393f/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/TextFileCertificateLoginModule.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/TextFileCertificateLoginModule.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/TextFileCertificateLoginModule.java
index dda073a..45a1211 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/TextFileCertificateLoginModule.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/jaas/TextFileCertificateLoginModule.java
@@ -32,8 +32,8 @@ import java.util.Set;
  * The user and role files' locations must be specified in the
  * org.apache.activemq.jaas.textfiledn.user and
  * org.apache.activemq.jaas.textfiledn.role properties respectively. NOTE: This
- * class will re-read user and group files for every authentication (i.e it does
- * live updates of allowed roles and users).
+ * class will re-read user and group files if they have been modified and the "reload"
+ * option is true
  */
 public class TextFileCertificateLoginModule extends CertificateLoginModule {
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1b6393f/docs/user-manual/en/security.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/security.md b/docs/user-manual/en/security.md
index a0abb3d..53a6efb 100644
--- a/docs/user-manual/en/security.md
+++ b/docs/user-manual/en/security.md
@@ -406,6 +406,8 @@ with LDAP is preferable. It is implemented by `org.apache.activemq.artemis.spi.c
 
 -   `org.apache.activemq.jaas.properties.role` - the path to the file which contains user and role properties
 
+-   `reload` - boolean flag; whether or not to reload the properties files when a modification occurs; default is `false`
+
 -   `debug` - boolean flag; if `true`, enable debugging; this is used only for testing or debugging; normally, it 
 should be set to `false`, or omitted; default is `false`
 
@@ -575,6 +577,8 @@ login module. The options supported by this login module are as follows:
 -   `org.apache.activemq.jaas.textfiledn.role` - specifies the location of the role properties file (relative to the 
     directory containing the login configuration file).
 
+-   `reload` - boolean flag; whether or not to reload the properties files when a modification occurs; default is `false`
+
 In the context of the certificate login module, the `users.properties` file consists of a list of properties of the form,
 `UserName=StringifiedSubjectDN`. For example, to define the users, system, user, and guest, you could create a file like
 the following:


[2/2] activemq-artemis git commit: This closes #594

Posted by ma...@apache.org.
This closes #594


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/372528d8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/372528d8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/372528d8

Branch: refs/heads/master
Commit: 372528d841bcaee8dd94822099a19f9eae5ef412
Parents: f10338a e1b6393
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue Jun 21 10:12:10 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Jun 21 10:12:10 2016 +0100

----------------------------------------------------------------------
 .../spi/core/security/jaas/TextFileCertificateLoginModule.java   | 4 ++--
 docs/user-manual/en/security.md                                  | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------