pom assembly reorganization

pom.xml

@@ -95,7 +95,7 @@
                         <version>2.6</version>
                         <configuration>
                             <descriptors>
-                                <descriptor>src/assembly/pwm.xml</descriptor>
+                                <descriptor>src/assembly/pwm-bundle.xml</descriptor>
                             </descriptors>
                             <finalName>${project.build.finalName}-${timestamp.iso}</finalName>
                         </configuration>
@@ -116,6 +116,41 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>make-ldif-schema-zip</id>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <finalName>${project.build.finalName}/public/reference/ldif-schema</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/build/assembly/ldif-schema-zip.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>make-source-reference-zip</id>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <finalName>${project.build.finalName}/public/reference/source</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                            <descriptors>
+                                <descriptor>src/build/assembly/source-reference.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -201,7 +236,7 @@
                         <id>validate</id>
                         <phase>validate</phase>
                         <configuration>
-                            <configLocation>checkstyle.xml</configLocation>
+                            <configLocation>src/build/checkstyle.xml</configLocation>
                             <encoding>UTF-8</encoding>
                             <consoleOutput>true</consoleOutput>
                             <includeTestResources>false</includeTestResources>
@@ -565,7 +600,7 @@
     </build>
 
     <reporting>
-        <!-- 
+        <!--
         Note: to run these reports, you can execute the maven command: "mvn site",
         then you can view the results by opening the file: target/site/project-reports.html in your browser.
          -->
@@ -889,4 +924,4 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
-</project>
+</project>

src/build/assembly/ldif-schema-zip.xml

@@ -0,0 +1,40 @@
+<!--
+  ~ Password Management Servlets (PWM)
+  ~ http://www.pwm-project.org
+  ~
+  ~ Copyright (c) 2006-2009 Novell, Inc.
+  ~ Copyright (c) 2009-2017 The PWM Project
+  ~
+  ~ This program is free software; you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation; either version 2 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program; if not, write to the Free Software
+  ~ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+
+    <id>ldif-schema</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <fileSets>
+        <fileSet>
+            <outputDirectory>/</outputDirectory>
+            <directory>${project.basedir}/src/build/ldif</directory>
+            <includes>
+                <include>*/**</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+</assembly>

src/build/assembly/source-reference.xml

@@ -0,0 +1,56 @@
+<!--
+  ~ Password Management Servlets (PWM)
+  ~ http://www.pwm-project.org
+  ~
+  ~ Copyright (c) 2006-2009 Novell, Inc.
+  ~ Copyright (c) 2009-2017 The PWM Project
+  ~
+  ~ This program is free software; you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation; either version 2 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~ along with this program; if not, write to the Free Software
+  ~ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+
+    <id>source-reference</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <files>
+        <file>
+            <source>${project.basedir}/pom.xml</source>
+        </file>
+        <file>
+            <source>${project.basedir}/LICENSE</source>
+        </file>
+    </files>
+    <fileSets>
+        <fileSet>
+            <outputDirectory>/src</outputDirectory>
+            <directory>${project.basedir}/src</directory>
+            <includes>
+                <include>*/**</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <outputDirectory>/supplemental</outputDirectory>
+            <directory>${project.basedir}/supplemental</directory>
+            <includes>
+                <include>*/**</include>
+            </includes>
+        </fileSet>
+    </fileSets>
+
+</assembly>

checkstyle.xml → src/build/checkstyle.xml

@@ -4,7 +4,7 @@
   ~ http://www.pwm-project.org
   ~
   ~ Copyright (c) 2006-2009 Novell, Inc.
-  ~ Copyright (c) 2009-2016 The PWM Project
+  ~ Copyright (c) 2009-2017 The PWM Project
   ~
   ~ This program is free software; you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -176,7 +176,7 @@
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
         <module name="ImportControl">
-            <property name="file" value="import-control.xml"/>
+            <property name="file" value="src/build/import-control.xml"/>
         </module>
 
 

src/build/ldif/AD-schema.ldif

@@ -0,0 +1,208 @@
+#======================================================
+#   -- Creates attributes and Auxiliary class
+#   -- Adds Auxiliary class to "User" class
+# 
+#	You can import this file using the following command
+#
+#	 ldifde -i -f AD-schema.ldif -c "DC=x" "#schemaNaming context"
+#
+#     ex: if your ad forest is "dc=org,dc=acme" then
+#	      ldifde -i -f AD-schema.ldif -c "DC=x" "dc=org,dc=acme"
+#
+#======================================================
+
+
+#------------------------------------------------------
+#-- Attribute:  	pwmEventLog
+#-- Syntax:      	OCTET STRING
+#-- Description:	User event log
+#------------------------------------------------------
+dn: CN=pwmEventLog,CN=Schema,CN=Configuration,DC=x
+changetype: ntdsschemaadd
+objectClass: attributeSchema
+cn: pwmEventLog
+attributeID: 1.3.6.1.4.1.35015.1.2.1
+attributeSyntax: 2.5.5.10
+isSingleValued: FALSE
+oMSyntax: 4
+isMemberOfPartialAttributeSet: FALSE
+lDAPDisplayName: pwmEventLog
+showInAdvancedViewOnly: TRUE
+adminDisplayName: pwmEventLog
+adminDescription: User event log
+searchFlags: 1
+
+#------------------------------------------------------
+#-- Attribute:  	pwmResponseSet
+#-- Syntax:      	OCTET STRING
+#-- Description:    Stores the user's challenge/response answers
+#------------------------------------------------------
+dn: CN=pwmResponseSet,CN=Schema,CN=Configuration,DC=x
+changetype: ntdsschemaadd
+objectClass: attributeSchema
+cn: pwmResponseSet
+attributeID: 1.3.6.1.4.1.35015.1.2.2
+attributeSyntax: 2.5.5.10
+isSingleValued: FALSE
+oMSyntax: 4
+isMemberOfPartialAttributeSet: FALSE
+lDAPDisplayName: pwmResponseSet
+showInAdvancedViewOnly: TRUE
+adminDisplayName: pwmResponseSet
+adminDescription: Stores the user's challenge/response answers
+searchFlags: 1
+
+#------------------------------------------------------
+#-- Attribute:  	pwmLastPwdUpdate
+#-- Syntax:      	TIME
+#-- Description:	Marks the last time the password was changed by user.
+#------------------------------------------------------
+dn: CN=pwmLastPwdUpdate,CN=Schema,CN=Configuration,DC=x
+changetype: ntdsschemaadd
+objectClass: attributeSchema
+cn: pwmLastPwdUpdate
+attributeID: 1.3.6.1.4.1.35015.1.2.3
+attributeSyntax: 2.5.5.11
+isSingleValued: FALSE
+oMSyntax: 24
+isMemberOfPartialAttributeSet: FALSE
+lDAPDisplayName: pwmLastPwdUpdate
+showInAdvancedViewOnly: TRUE
+adminDisplayName: pwmLastPwdUpdate
+adminDescription: Marks the last time the password was changed by user
+searchFlags: 1
+
+#------------------------------------------------------
+#-- Attribute:  	pwmGUID
+#-- Syntax:      	STRING
+#-- Description:	Marks the last time the password was changed by user.
+#------------------------------------------------------
+dn: CN=pwmGUID,CN=Schema,CN=Configuration,DC=x
+changetype: ntdsschemaadd
+objectClass: attributeSchema
+cn: pwmGUID
+attributeID: 1.3.6.1.4.1.35015.1.2.4
+attributeSyntax: 2.5.5.12
+isSingleValued: FALSE
+oMSyntax: 64
+isMemberOfPartialAttributeSet: FALSE
+lDAPDisplayName: pwmGUID
+showInAdvancedViewOnly: TRUE
+adminDisplayName: pwmGUID
+adminDescription: pwmGUID
+searchFlags: 1
+
+#------------------------------------------------------
+#-- Attribute:  	pwmToken
+#-- Syntax:      	STRING
+#-- Description:	Storage of validation token.
+#------------------------------------------------------
+dn: CN=pwmToken,CN=Schema,CN=Configuration,DC=x
+changetype: ntdsschemaadd
+objectClass: attributeSchema
+cn: pwmToken
+attributeID: 1.3.6.1.4.1.35015.1.2.5
+attributeSyntax: 2.5.5.12
+isSingleValued: FALSE
+oMSyntax: 64
+isMemberOfPartialAttributeSet: FALSE
+lDAPDisplayName: pwmToken
+showInAdvancedViewOnly: TRUE
+adminDisplayName: pwmToken
+adminDescription: pwmToken
+searchFlags: 1
+
+
+#------------------------------------------------------
+#-- Attribute:  	pwmOtpSecret
+#-- Syntax:      	OCTET STRING
+#-- Description:	Stores the user's challenge/response answers
+#------------------------------------------------------
+dn: CN=pwmOtpSecret,CN=Schema,CN=Configuration,DC=x
+changetype: ntdsschemaadd
+objectClass: attributeSchema
+cn: pwmOtpSecret
+attributeID: 1.3.6.1.4.1.35015.1.2.6
+attributeSyntax: 2.5.5.10
+isSingleValued: FALSE
+oMSyntax: 4
+isMemberOfPartialAttributeSet: FALSE
+lDAPDisplayName: pwmOtpSecret
+showInAdvancedViewOnly: TRUE
+adminDisplayName: pwmOtpSecret
+adminDescription: Stores the user's challenge/response answers
+searchFlags: 1
+
+
+#------------------------------------------------------
+#--  Update the schema now
+#------------------------------------------------------
+dn: 
+changetype: modify
+add: schemaUpdateNow
+schemaUpdateNow: 1
+-
+
+#------------------------------------------------------
+#-- Class:        pwmUser
+#-- Description:  Aux class
+#-- Req:          none
+#--
+#-- pwmUser aux class
+#--
+#------------------------------------------------------
+dn: CN=pwmuser,CN=Schema,CN=Configuration,DC=x
+changetype: ntdsschemaadd
+objectClass: classSchema
+subClassOf: top
+cn: pwmuser
+governsID: 1.3.6.1.4.1.35015.1.1.1
+mayContain: pwmLastPwdUpdate
+mayContain: pwmResponseSet
+mayContain: pwmEventLog
+mayContain: pwmGUID
+mayContain: pwmToken
+mayContain: pwmOtpSecret
+objectClassCategory: 3
+rDNAttID: cn
+showInAdvancedViewOnly: TRUE
+adminDisplayName: pwmuser
+adminDescription: pwmUser Auxiliary class
+
+#------------------------------------------------------
+#--  Update the schema now
+#------------------------------------------------------
+dn: 
+changetype: modify
+add: schemaUpdateNow
+schemaUpdateNow: 1
+-
+
+#------------------------------------------------------
+#--  Add Auxililary class pwmuser to User 
+#------------------------------------------------------
+dn: CN=User,CN=Schema,CN=Configuration,DC=x
+changetype: ntdsSchemaModify
+add: auxiliaryClass
+auxiliaryClass: pwmuser
+-
+
+#------------------------------------------------------
+#--  Modify the pwmuser Auxililary class (if it existed prior to this, we want to add the newer attributes)
+#------------------------------------------------------
+dn: CN=pwmuser,CN=Schema,CN=Configuration,DC=x
+changetype: ntdsSchemaModify
+add: mayContain
+mayContain: pwmGUID
+mayContain: pwmToken
+mayContain: pwmOtpSecret
+-
+
+#------------------------------------------------------
+#--  Update the schema now
+#------------------------------------------------------
+dn: 
+changetype: modify
+add: schemaUpdateNow
+schemaUpdateNow: 1
+-

src/build/ldif/OracleDS-schema.ldif

@@ -0,0 +1,116 @@
+#------------------------------------------------------
+#-- Attribute:          pwmEventLog
+#-- Syntax:             OCTET STRING
+#-- Description:        User event log
+#------------------------------------------------------
+dn: cn=schema
+changetype: modify
+add: attributeTypes
+attributeTypes: (
+  1.3.6.1.4.1.35015.1.2.1
+  NAME 'pwmEventLog'
+  DESC 'SSPR defined attribute type'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.40
+  X-ORIGIN 'iPlanet Directory Server'
+ )
+
+#------------------------------------------------------
+#-- Attribute:          pwmResponseSet
+#-- Syntax:             OCTET STRING
+#-- Description:    Stores the user's challenge/response answers
+#----------------------------------
+dn: cn=schema
+changetype: modify
+add: attributeTypes
+attributeTypes: (
+  1.3.6.1.4.1.35015.1.2.2
+  NAME 'pwmResponseSet'
+  DESC 'SSPR defined attribute type'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.40
+  X-ORIGIN 'iPlanet Directory Server'
+ )
+
+#------------------------------------------------------
+#-- Attribute:          pwmLastPwdUpdate
+#-- Syntax:             TIME
+#-- Description:        Marks the last time the password was changed by user.
+#------------------------------------------------------
+dn: cn=schema
+changetype: modify
+add: attributeTypes
+attributeTypes: (
+  1.3.6.1.4.1.35015.1.2.3
+  NAME 'pwmLastPwdUpdate'
+  DESC 'SSPR defined attribute type'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
+  X-ORIGIN 'iPlanet Directory Server'
+ )
+
+#------------------------------------------------------
+#-- Attribute:          pwmGUID
+#-- Syntax:             String
+#-- Description:        GUID used to identify user
+#------------------------------------------------------
+dn: cn=schema
+changetype: modify
+add: attributeTypes
+attributeTypes: (
+  1.3.6.1.4.1.35015.1.2.4
+  NAME 'pwmGUID'
+  DESC 'SSPR defined attribute type'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  X-ORIGIN 'iPlanet Directory Server'
+ )
+
+#------------------------------------------------------
+#-- Attribute:          pwmToken
+#-- Syntax:             String
+#-- Description:        GUID used to identify user
+#------------------------------------------------------
+dn: cn=schema
+changetype: modify
+add: attributeTypes
+attributeTypes: (
+  1.3.6.1.4.1.35015.1.2.5
+  NAME 'pwmToken'
+  DESC 'SSPR defined attribute type'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  X-ORIGIN 'iPlanet Directory Server'
+ )
+
+#------------------------------------------------------
+#-- Attribute:  	pwmOtpSecret
+#-- Syntax:      	OCTET STRING
+#-- Description:    Stores the user's challenge/response answers
+#------------------------------------------------------
+dn: cn=schema
+changetype: modify
+add: attributeTypes
+attributeTypes: (
+  1.3.6.1.4.1.35015.1.2.6
+  NAME 'pwmOtpSecret'
+  DESC 'SSPR defined attribute type'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.40
+  X-ORIGIN 'iPlanet Directory Server'
+ )
+
+
+#------------------------------------------------------
+#-- Class:        pwmUser
+#-- Description:  Aux class
+#-- Req:          none
+#--
+#-- pwmUser aux class
+#--
+#------------------------------------------------------
+dn: cn=schema
+changetype: modify
+add: objectClasses
+objectClasses: (
+  1.3.6.1.4.1.35015.1.1.1
+  NAME 'pwmUser'
+  DESC 'SSPR defined aux class'
+  AUXILIARY
+  MAY ( pwmEventLog $ pwmResponseSet $ pwmLastPwdUpdate $ pwmGUID $ pwmToken $ pwmOtpSecret)
+  X-ORIGIN 'SSPR Administrator'
+ )

src/main/webapp/public/reference/ldap-schema.jsp

@@ -43,6 +43,12 @@
     <div id="centerbody">
         <%@ include file="reference-nav.jsp"%>
         <p>Below is the default LDAP schema definition.</p>
+
+        <p>
+        <form action="ldif-schema.zip" method="get">
+            <button class="btn" type="submit">Download Schema LDIFs</button>
+        </form>
+        </p>
         <%final List<SchemaDefinition> schemaDefinitions = SchemaDefinition.getPwmSchemaDefinitions();%>
         <div class="border">
             <code>

src/main/webapp/public/reference/license.jsp

@@ -83,6 +83,11 @@
                 Error: attribution file not found: attribution.xml
             </div>
         <% } %>
+        <p>
+        <form action="source.zip" method="get">
+            <button class="btn" type="submit">Download Source</button>
+        </form>
+        </p>
         <span class="footnote">nanos gigantum humeris insidentes</span>
     </div>
     <div class="push"></div>

supplemental/ldif/edirectory-rights.ldif

@@ -1,81 +0,0 @@
-#
-# Sample LDIF for creating rights for PWM in eDirectory.  
-#
-# In this sample:
-#  - the proxy user is created is "cn=PwmProxy,ou=OU,o=O"
-#  - users exist in "ou=USERS,o=O"
-#
-# Search and replace the values as appropriate for your environment.
-#
-# This file is not intended as a direct script to configure rights in your environment, it
-# is just useful as a template or sample to get you started.  It is up to the directory owner
-# to determine the entries and ACLs needed to run this software optimally.
-
-# Grant users rights for users to configure responses
-dn: ou=USERS,o=O
-changetype: modify
-add: ACL
-ACL: 7#subtree#[This]#pwmResponseSet
-
-# Grant users rights for users to configure an OTP secret
-dn: ou=USERS,o=O
-changetype: modify
-add: ACL
-ACL: 7#subtree#[This]#pwmOtpSecret
-
-#Create the PWM proxy user.
-dn: cn=PwmProxy,ou=OU,o=O
-changetype: add
-givenName: PwmProxy
-sn: PwmProxy
-objectClass: inetOrgPerson
-objectClass: organizationalPerson
-objectClass: top
-
-# Grant rights to the users container for the proxy user
-dn: ou=USERS,o=O
-changetype: modify
-add: ACL
-ACL: 1#subtree#cn=PwmProxy,ou=OU,o=O#[Entry Rights]
-
-# Grant rights to the users container for the proxy user
-dn: ou=USERS,o=O
-changetype: modify
-add: ACL
-ACL: 3#subtree#cn=PwmProxy,ou=OU,o=O#cn
-
-# Grant rights to the users container for the proxy user
-dn: ou=USERS,o=O
-changetype: modify
-add: ACL
-ACL: 3#subtree#cn=PwmProxy,ou=OU,o=O#pwmResponseSet
-
-# Grant rights to the users container for the proxy user
-dn: ou=USERS,o=O
-changetype: modify
-add: ACL
-ACL: 7#subtree#cn=PwmProxy,ou=OU,o=O#pwmLastPwdUpdate
-
-# Grant rights to the users container for the proxy user
-dn: ou=USERS,o=O
-changetype: modify
-add: ACL
-ACL: 3#subtree#cn=PwmProxy,ou=OU,o=O#pwmOtpSecret
-
-# Grant rights to the users container for the proxy user
-dn: ou=USERS,o=O
-changetype: modify
-add: ACL
-ACL: 7#subtree#cn=PwmProxy,ou=OU,o=O#objectClass
-
-# Grant rights to the users container for the proxy user
-dn: ou=USERS,o=O
-changetype: modify
-add: ACL
-ACL: 7#subtree#cn=PwmProxy,ou=OU,o=O#pwmEventLog
-
-# Grant rights to the users container for the proxy user
-dn: ou=USERS,o=O
-changetype: modify
-add: ACL
-ACL: 7#subtree#cn=PwmProxy,ou=OU,o=O#passwordManagement