updated dist-config files

git-svn-id: https://textgridlab.org/svn/textgrid/trunk/middleware/tgauth@11441 7c539038-3410-0410-b1ec-0f2a7bf1c452

info.textgrid.middleware.tgauth.rbac/conf-dist/rbac.conf

@@ -2,16 +2,14 @@
 <configuration>
 
   <section name="user">
-    <var name="host">example.textgrid.de</var>
+    <var name="host">ldap.example.org</var>
     <var name="port">389</var>
     <var name="version">3</var>
     <var name="tls">no</var>
-    <var name="base">ou=people,dc=rbac,dc=textgrid,dc=de</var>
-    <var name="binddn">cn=manager,dc=rbac,dc=textgrid,dc=de</var>
-    <var name="password">secret</var>
+    <var name="base">ou=people,ou=rbac,dc=textgrid,dc=de</var>
+    <var name="binddn">cn=rbac,ou=bindaccounts,dc=textgrid,dc=de</var>
+    <var name="password">XXXXXXXXX</var>
     <var name="filter">(objectClass=inetorgperson)</var>
-    <var name="userEntryDefinitionClass">InetOrgDefinition</var>
-    <var name="userEntryDefinitionFile">/srv/vhosts/textgrid.regengedanken.de/www/htdocs/rbac/InetOrgDefinition.class.php</var>
 
     <!-- Possile values are "uid", "cn", "sn" or any other used in the
          objectClass "inetOrgPerson". If you want to use another attribute, you
@@ -22,13 +20,13 @@
   </section>
 
   <section name="role">
-    <var name="host">example.textgrid.de</var>
+    <var name="host">ldap.example.org</var>
     <var name="port">389</var>
     <var name="version">3</var>
     <var name="tls">no</var>
-    <var name="base">ou=roles,dc=rbac,dc=textgrid,dc=de</var>
-    <var name="binddn">cn=manager,dc=rbac,dc=textgrid,dc=de</var>
-    <var name="password">secret</var>
+    <var name="base">ou=roles,ou=rbac,dc=textgrid,dc=de</var>
+    <var name="binddn">cn=rbac,ou=bindaccounts,dc=textgrid,dc=de</var>
+    <var name="password">XXXXXXXXX</var>
     <var name="namingattribute">rbacname</var>
     <var name="filter">(objectClass=rbacrole)</var>
 
@@ -37,25 +35,25 @@
   </section>
 
   <section name="session">
-    <var name="host">example.textgrid.de</var>
+    <var name="host">ldap.example.org</var>
     <var name="port">389</var>
     <var name="version">3</var>
     <var name="tls">no</var>
-    <var name="base">ou=sessions,dc=rbac,dc=textgrid,dc=de</var>
-    <var name="binddn">cn=manager,dc=rbac,dc=textgrid,dc=de</var>
-    <var name="password">secret</var>
+    <var name="base">ou=sessions,ou=rbac,dc=textgrid,dc=de</var>
+    <var name="binddn">cn=rbac,ou=bindaccounts,dc=textgrid,dc=de</var>
+    <var name="password">XXXXXXXXX</var>
     <var name="namingattribute">rbacname</var>
     <var name="filter">(objectClass=rbacsession)</var>
   </section>
 
   <section name="resource">
-    <var name="host">example.textgrid.de</var>
+    <var name="host">ldap.example.org</var>
     <var name="port">389</var>
     <var name="version">3</var>
     <var name="tls">no</var>
-    <var name="base">dc=rbac,dc=textgrid,dc=de</var>
-    <var name="binddn">cn=manager,dc=rbac,dc=textgrid,dc=de</var>
-    <var name="password">secret</var>
+    <var name="base">ou=rbac,dc=textgrid,dc=de</var>
+    <var name="binddn">cn=rbac,ou=bindaccounts,dc=textgrid,dc=de</var>
+    <var name="password">XXXXXXXXX</var>
     <var name="namingattribute">rbacname</var>
     <var name="aliasattribute">tgresourceuri</var>
     <var name="filter">(objectClass=rbacresource)</var>
@@ -68,7 +66,7 @@
                the rbacSoap.conf.xml file. If you change this, you
                might also have to change the parameters given there. -->
   <section name="project">
-    <var name="base">rbacname=Projekt-Teilnehmer,ou=roles,dc=rbac,dc=textgrid,dc=de</var>
+    <var name="base">rbacname=Projekt-Teilnehmer,ou=roles,ou=rbac,dc=textgrid,dc=de</var>
     <var name="leaderRoleName">Projektleiter</var>
     <var name="administratorRoleName">Administrator</var>
     <var name="editorRoleName">Bearbeiter</var>
@@ -112,7 +110,7 @@
     <var name="LDAP_ERROR">An LDAP-Error occured, see description: </var>
     <var name="UNKNOWN_ERROR">An error occured.</var>
     <var name="SD_ALLREADY_EXISTS">The Separation of Duty Set allready exists.</var>
-    <var name="SD_CARDINALITY">The given cardinality is invalid! Make sure it is >= 2</var>
+    <var name="SD_CARDINALITY">The given cardinality is invalid! Make sure it is &gt;= 2</var>
     <var name="SD_UNKNOWN">The Separation of Duty set is unknown</var>
   </section>
 

info.textgrid.middleware.tgauth.rbac/conf-dist/rbacSoap.conf

 <configuration>
 
+  <section name="crud">
+    <var name="secret">XXXXXXXXXX</var>
+  </section>
+
+  <section name="webAuth">
+    <var name="secret">XXXXXXXXXXXXXX</var>
+  </section>
+
+  <section name="SIDcheck">
+    <var name="secret">XXXXXXXXXXXXX</var>
+  </section>
+
+  <section name="userdetails">
+    <!-- order matters for the web form s display -->
+    <var name="00order">givenname surname displayname mail organisation orgunit street plz city country tel citizenship interest personid agreesearch ToUversion</var>
+    <!-- value: optionalness|attrNameInLDAP|schemaNameInLDAP|attrDisplayname|attrDescription -->
+    <var name="givenname">mandatory|givenname|inetOrgPerson|Given Name|Your First Name</var>
+    <var name="surname">mandatory|sn|inetOrgPerson|Surname|Your Last Name</var>
+    <var name="displayname">optional|displayname|inetOrgPerson|Full Name|Your Name for Display Purposes</var>
+    <var name="mail">mandatory|mail|inetOrgPerson|E-Mail|Your Electronic Mail Address</var>
+    <var name="organisation">mandatory|o|inetOrgPerson|Institution|Institute or Organisation</var>
+    <var name="orgunit">optional|ou|inetOrgPerson|Department|Organisational Unit</var>
+    <var name="street">mandatory|street|inetOrgPerson|Street|Institution\'s Street Address incl. Number</var>
+    <var name="plz">mandatory|postalCode|inetOrgPerson|Zip Code|Postal Code, Zipcode or PLZ</var>
+    <var name="city">mandatory|l|inetOrgPerson|City|Location of Institute</var>
+    <var name="country">mandatory|c|TextGridUser|Country|Country of Residence</var>
+    <var name="tel">mandatory|telephoneNumber|inetOrgPerson|Phone|Phone Number, International Format</var>
+    <var name="citizenship">mandatory|schacCountryOfCitizenship|schacPersonalCharacteristics|Citizenship|Your Country of Citizenship</var>
+    <var name="interest">optional|TGfieldOfInterest|TextGridUser|Field of Interest|Optional specification of fields of research interests in conjuction with TextGrid</var>
+    <var name="personid">optional|TGidentifierForPerson|TextGridUser|Person ID|PND / URI for Person, e.g. http://xyz.org/~johndoe</var>
+    <var name="agreesearch">optional|TGagreeSearch|TextGridUser|Searchable|If this option is set, other TextGrid users can find you by Name, Institution or E-Mail-Address</var>
+    <var name="ToUversion">mandatory|TGacceptedTermsOfUse|TextGridUser|Terms Of Use|Latest Version of Terms Of Use that has been accepted by user</var>
+  </section>
+
   <section name="errorCode">
     <var name="OK">1</var>
     <var name="INSUFFICIENT_ACCESS">2</var>
     <var name="AUTHENTICATION_ERROR">4</var>
+    <var name="RESOURCENOTFOUND_ERROR">8</var>
+    <var name="UNKNOWN_PROJECT">16</var>
   </section>
 
   <section name="errorDescription">
     <var name="OK">Ok</var>
     <var name="INSUFFICIENT_ACCESS">This function requires an authentication and authorization.</var>
     <var name="AUTHENTICATION_ERROR">Authentication was not successfull. Username or password are incorrect.</var>
+    <var name="RESOURCENOTFOUND_ERROR">The given resource is unknown to the system.</var>
+    <var name="UNKNOWN_PROJECT">The given project is unknown to the system.</var>
   </section>
 
   <section name="authentication">
-    <var name="host">example.textgrid.de</var>
+    <var name="host">ldap.example.org</var>
     <var name="port">389</var>
     <var name="version">3</var>
     <var name="tls">no</var>
-    <var name="base">ou=people,dc=rbac,dc=textgrid,dc=de</var>
-    <var name="binddn">cn=manager,dc=rbac,dc=textgrid,dc=de</var>
-    <var name="password">secret</var>
+    <var name="base">ou=people,ou=rbac,dc=textgrid,dc=de</var>
+    <var name="binddn">cn=rbac,ou=bindaccounts,dc=textgrid,dc=de</var>
+    <var name="password">XXXXXXXXXXXX</var>
     <var name="namingattribute">uid</var>
   </section>
 
-  <section name="counter">
-    <var name="host">example.textgrid.de</var>
-    <var name="port">389</var>
-    <var name="version">3</var>
-    <var name="tls">no</var>
-    <var name="base">ou=counter,dc=rbac,dc=textgrid,dc=de</var>
-    <var name="binddn">cn=manager,dc=rbac,dc=textgrid,dc=de</var>
-    <var name="password">secret</var>
-    <var name="namingattribute">cn</var>
-  </section>
-
-
   <!-- All trees under which users are created
        have this naming-attribute -->
   <section name="user">
@@ -48,13 +74,15 @@
        configured for the rbac-system! -->
   <section name="project">
     <var name="base">Projekt-Teilnehmer</var>
+    <!-- list the Sand Box Projects separated by ";", e.g. "TGPR3;TGPR25". -->
+    <var name="sandBoxProjects"></var>
   </section>
 
 
   <!-- This base is used to create new
        TextGrid-Resources. -->
   <section name="textGridResource">
-    <var name="base">ou=resources,dc=rbac,dc=textgrid,dc=de</var>
+    <var name="base">ou=resources,ou=rbac,dc=textgrid,dc=de</var>
   </section>
 
 </configuration>

info.textgrid.middleware.tgauth.rbac/conf-dist/system.conf

@@ -38,7 +38,9 @@
        RBAC-Framework. Give a full path or a path relative
        to your main application. -->
   <extension class="PublicResource" file="../tgExtensions/PublicResource.class.php" />
+  <extension class="ReadableProjectFile" file="../tgExtensions/ReadableProjectFile.class.php" />
   <extension class="Project" file="../tgExtensions/Project.class.php" />
+  <extension class="UpdateTimestamp" file="../tgExtensions/UpdateTimestamp.class.php" />
 <!--  <extension class="SSD" file="../rbac/extensions/SSD.class.php" /> -->
 <!--  <extension class="DSD" file="../rbac/extensions/DSD.class.php" /> -->
   <extension class="Logger" file="../tgExtensions/Logger.class.php" />