manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1705286 - in /manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main: java/org/apache/manifoldcf/authorities/authorities/ldap/ resources/ resources/org/ resources/org/apache/ resources/org/apache/manifoldcf/ resources/org/a...
Date Fri, 25 Sep 2015 12:41:07 GMT
Author: kwright
Date: Fri Sep 25 12:41:06 2015
New Revision: 1705286

URL: http://svn.apache.org/viewvc?rev=1705286&view=rev
Log:
Add templates

Added:
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration.js
  (with props)
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_ForcedTokens.html
  (with props)
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html
  (with props)
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html
  (with props)
Modified:
    manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java

Modified: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java?rev=1705286&r1=1705285&r2=1705286&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
(original)
+++ manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
Fri Sep 25 12:41:06 2015
@@ -26,7 +26,9 @@ import javax.naming.directory.*;
 import javax.naming.ldap.*;
 import org.apache.manifoldcf.authorities.interfaces.*;
 import org.apache.manifoldcf.authorities.system.ManifoldCF;
+import org.apache.manifoldcf.authorities.system.Logging;
 import org.apache.manifoldcf.core.interfaces.*;
+import org.apache.manifoldcf.connectorcommon.interfaces.*;
 import org.apache.manifoldcf.ui.util.Encoder;
 
 /**
@@ -73,6 +75,10 @@ public class LDAPAuthority extends org.a
 
   private String userNameAttr;
 
+  private String sslKeystoreData;
+  
+  private IKeystoreManager sslKeystore;
+  
   private long responseLifetime = 60000L; //60sec
 
   private int LRUsize = 1000;
@@ -113,6 +119,8 @@ public class LDAPAuthority extends org.a
     serverPort = configParams.getParameter("ldapServerPort");
     serverBase = configParams.getParameter("ldapServerBase");
 
+    sslKeystoreData = configParams.getParameter("sslKeystore");
+    
     userBase = configParams.getParameter("ldapUserBase");
     userSearch = configParams.getParameter("ldapUserSearch");
     groupBase = configParams.getParameter("ldapGroupBase");
@@ -169,6 +177,12 @@ public class LDAPAuthority extends org.a
       throw new ManifoldCFException("User name attribute missing but required");
     }
 
+    if (sslKeystoreData != null) {
+      sslKeystore = KeystoreManagerFactory.make("", sslKeystoreData);
+    } else {
+      sslKeystore = null;
+    }
+
     Hashtable env = new Hashtable();
     env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");
     env.put(Context.PROVIDER_URL, "ldap://" + serverName + ":" + serverPort + "/" + serverBase);
@@ -280,6 +294,8 @@ public class LDAPAuthority extends org.a
     groupNameAttr = null;
     userNameAttr = null;
     forcedTokens = null;
+    sslKeystoreData = null;
+    sslKeystore = null;
   }
 
   protected String createCacheConnectionString() {
@@ -576,6 +592,8 @@ public class LDAPAuthority extends org.a
     String fServerPort = getParam(parameters, "ldapServerPort", "389");
     String fServerBase = getParam(parameters, "ldapServerBase", "");
 
+    String sslKeystoreData = getParam(parameters, "sslKeystore", null);
+    
     String fUserBase = getParam(parameters, "ldapUserBase", "ou=People");
     String fUserSearch = getParam(parameters, "ldapUserSearch", "(&(objectClass=inetOrgPerson)(uid={0}))");
     String fUserNameAttr = getParam(parameters, "ldapUserNameAttr", "uid");
@@ -595,6 +613,33 @@ public class LDAPAuthority extends org.a
     }
     fBindPass = out.mapPasswordToKey(fBindPass);
 
+    final IKeystoreManager localSslKeystore;
+    Map<String,String> serverCertificatesMap = null;
+    String message = null;
+
+    try {
+      if (sslKeystoreData == null)
+        localSslKeystore = KeystoreManagerFactory.make("");
+      else
+        localSslKeystore = KeystoreManagerFactory.make("",sslKeystoreData);
+
+      // List the individual certificates in the store, with a delete button for each
+      String[] contents = localSslKeystore.getContents();
+      if (contents.length > 0)
+      {
+        serverCertificatesMap = new HashMap<>();
+        for (final String alias : contents) {
+          String description = localSslKeystore.getDescription(alias);
+          if (description.length() > 128)
+            description = description.substring(0,125) + "...";
+          serverCertificatesMap.put(alias, description);
+        }
+      }
+    } catch (ManifoldCFException e) {
+      message = e.getMessage();
+      Logging.authorityConnectors.warn(e);
+    }
+
     if (tabName.equals(Messages.getString(locale, "LDAP.LDAP"))) {
       out.print(
         "<table class=\"displaytable\">\n"

Added: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration.js
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration.js?rev=1705286&view=auto
==============================================================================
--- manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration.js
(added)
+++ manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration.js
Fri Sep 25 12:41:06 2015
@@ -0,0 +1,147 @@
+<!DOCTYPE html>
+<!--
+Copyright 2014 The Apache Software Foundation.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<script type="text/javascript">
+    <!--
+    function ServerDeleteCertificate(aliasName)
+    {
+      editconnection.serverkeystorealias.value = aliasName;
+      editconnection.serverconfigop.value = "Delete";
+      postForm();
+    }
+
+    function ServerAddCertificate()
+    {
+      if (editconnection.servercertificate.value == "")
+      {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.ChooseACertificateFile'))");
+        editconnection.servercertificate.focus();
+      }
+      else
+      {
+        editconnection.serverconfigop.value = "Add";
+        postForm();
+      }
+    }
+
+    function checkConfig() {
+      if (editconnection.ldapServerName.value.indexOf("/") != -1) {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.ServerNameCannotIncludeSlash'))");
+        editconnection.ldapServerName.focus();
+        return false;
+      }
+      if (editconnection.ldapServerPort.value != "" && !isInteger(editconnection.ldapServerPort.value))
{
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.ServerPortMustBeAnInteger'))");
+        editconnection.ldapServerPort.focus();
+        return false;
+      }
+      if (editconnection.ldapServerBase.value.indexOf("/") != -1) {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.ServerBaseCannotIncludeSlash'))");
+        editconnection.ldapServerBase.focus();
+        return false;
+      }
+      if (editconnection.ldapUserSearch.value != "" && editconnection.ldapUserSearch.value.indexOf("{0}")
== -1) {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.UserSearchMustIncludeSubstitution'))");
+        editconnection.ldapUserSearch.focus();
+        return false;
+      }
+      if (editconnection.ldapGroupSearch.value != "" && editconnection.ldapGroupSearch.value.indexOf("{0}")
== -1) {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.GroupSearchMustIncludeSubstitution'))");
+        editconnection.ldapGroupSearch.focus();
+        return false;
+      }
+      return true;
+    }
+
+    function checkConfigForSave() {
+      if (editconnection.ldapServerName.value == "") {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.ServerNameCannotBeBlank'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.LDAP'))");
+        editconnection.ldapServerName.focus();
+        return false;
+      }
+      if (editconnection.ldapServerPort.value == "") {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.ServerPortCannotBeBlank'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.LDAP'))");
+        editconnection.ldapServerPort.focus();
+        return false;
+      }
+      if (editconnection.ldapUserSearch.value == "") {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.UserSearchCannotBeBlank'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.LDAP'))");
+        editconnection.ldapUserSearch.focus();
+        return false;
+      }
+      if (editconnection.ldapGroupSearch.value == "") {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.GroupSearchCannotBeBlank'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.LDAP'))");
+        editconnection.ldapGroupSearch.focus();
+        return false;
+      }
+      if (editconnection.ldapGroupNameAttr.value == "") {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.GroupNameAttrCannotBeBlank'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.LDAP'))");
+        editconnection.ldapGroupNameAttr.focus();
+        return false;
+      }
+      if (editconnection.ldapUserSearch.value != "" && editconnection.ldapUserSearch.value.indexOf("{0}")
== -1) {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.UserSearchMustIncludeSubstitution'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.LDAP'))");
+        editconnection.ldapUserSearch.focus();
+        return false;
+      }
+      if (editconnection.ldapGroupSearch.value != "" && editconnection.ldapGroupSearch.value.indexOf("{0}")
== -1) {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.GroupSearchMustIncludeSubstitution'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.LDAP'))");
+        editconnection.ldapGroupSearch.focus();
+        return false;
+      }
+      if (editconnection.ldapServerPort.value != "" && !isInteger(editconnection.ldapServerPort.value))
{
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.ServerPortMustBeAnInteger'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.LDAP'))");
+        editconnection.ldapServerPort.focus();
+        return false;
+      }
+      if (editconnection.ldapServerName.value.indexOf("/") != -1) {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.ServerNameCannotIncludeSlash'))");
+        SelectTab("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.LDAP'))");
+        editconnection.ldapServerName.focus();
+        return false;
+      }
+      if (editconnection.ldapServerBase.value.indexOf("/") != -1) {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.ServerBaseCannotIncludeSlash'))");
+        editconnection.ldapServerBase.focus();
+        return false;
+      }
+      return true;
+    }
+    
+    function SpecOp(n, opValue, anchorvalue) {
+      eval("editconnection."+n+".value = \""+opValue+"\"");
+      postFormSetAnchor(anchorvalue);
+    }
+    
+    function SpecAddToken(anchorvalue) {
+      if (editconnection.spectoken.value == "")
+      {
+        alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('LDAP.TypeInToken'))");
+        editconnection.spectoken.focus();
+        return;
+      }
+      SpecOp("accessop","Add",anchorvalue);
+    }
+    //-->
+</script>

Propchange: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration.js
------------------------------------------------------------------------------
    svn:keywords = Id

Added: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_ForcedTokens.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_ForcedTokens.html?rev=1705286&view=auto
==============================================================================
--- manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_ForcedTokens.html
(added)
+++ manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_ForcedTokens.html
Fri Sep 25 12:41:06 2015
@@ -0,0 +1,68 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+#if($TabName == $ResourceBundle.getString('LDAP.ForcedTokens'))
+
+<table class="displaytable">
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  <tr><td class="value" colspan="2">$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.ForcedTokensDisclaimer'))</td></tr>
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  #set($counter = 0)
+  #foreach($forcedtoken in $FORCEDTOKENS)
+  <tr>
+    <td class="description">
+      <input type="hidden" name="accessop_$counter" value=""/>
+      <input type="hidden" name="spectoken_$counter" value="$Encoder.attributeEscape($forcedtoken)"/>
+      <a name="token_$counter">
+        <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getMessage('LDAP.Delete'))"
onClick='Javascript:SpecOp("accessop_$counter","Delete","token_$counter")' alt="$Encoder.attributeEscape($ResourceBundle.getMessage('LDAP.DeleteToken')$counter)"/>
+      </a>
+    </td>
+    <td class="value">
+      $Encoder.bodyEscape($forcedtoken)
+    </td>
+  </tr>
+    #set($counter = $counter + 1)
+  #end
+  #if ($counter == 0)
+  <tr>
+    <td class="message" colspan="2">$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.NoTokensPresent'))</td>
+  </tr>
+  #end
+  <tr><td class="lightseparator" colspan="2"><hr/></td></tr>
+  <tr>
+    <td class="description">
+      <input type="hidden" name="tokencount" value="$counter"/>
+  #set($counterplusone = $counter + 1)
+      <input type="hidden" name="accessop" value=""/>
+      <a name="token_$counter">
+        <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getMessage('LDAP.Add'))"
onClick='Javascript:SpecAddToken("token_$counterplusone")' alt="$Encoder.attributeEscape($ResourceBundle.getMessage('LDAP.AddToken'))"/>
+      </a>
+    </td>
+    <td class="value">
+      <input type="text" size="30" name="spectoken" value=""/>
+    </td>
+  </tr>
+</table>
+#else
+  #set($counter = 0)
+  #foreach($forcedtoken in $FORCEDTOKENS)
+<input type="hidden" name="spectoken_$counter" value="$Encoder.attributeEscape($forcedtoken)"/>);
+    #set($counter = $counter + 1)
+  #end
+<input type="hidden" name="tokencount" value="$counter"/>);
+#end
+

Propchange: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_ForcedTokens.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_ForcedTokens.html
------------------------------------------------------------------------------
    svn:keywords = Id

Added: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html?rev=1705286&view=auto
==============================================================================
--- manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html
(added)
+++ manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html
Fri Sep 25 12:41:06 2015
@@ -0,0 +1,151 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<input name="serverconfigop" type="hidden" value="Continue"/>
+#if($SSLKEYSTOREDATA)
+<input type="hidden" name="sslkeystoredata" value="$Encoder.attributeEscape($SSLKEYSTOREDATA)"/>
+#end
+
+#if($TabName == $ResourceBundle.getString('LDAP.LDAP'))
+<table class="displaytable">
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.LDAPServerNameColon'))</nobr></td>
+    <td class="value"><input type="text" size="32" name="ldapServerName" value="$Encoder.attributeEscape($FSERVERNAME)"/></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.LDAPServerPortColon'))</nobr></td>
+    <td class="value"><input type="text" size="5" name="ldapServerPort" value="$Encoder.attributeEscape($FSERVERPORT)"/></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.LDAPServerBaseColon'))</nobr></td>
+    <td class="value"><input type="text" size="64" name="ldapServerBase" value="$Encoder.attributeEscape($FSERVERBASE)"/></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.LDAPBindUserColon'))</nobr></td>
+    <td class="value"><input type="text" size="64" name="ldapBindUser" value="$Encoder.attributeEscape($FBINDUSER)"/></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.LDAPBindPasswordColon'))</nobr></td>
+    <td class="value"><input type="password" size="64" name="ldapBindPass" value="$Encoder.attributeEscape($FBINDPASS)"/></td>
+  </tr>
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.UserSearchBaseColon'))</nobr></td>
+    <td class="value"><input type="text" size="64" name="ldapUserBase" value="$Encoder.attributeEscape($FUSERBASE)"/></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.UserSearchFilterColon'))</nobr></td>
+    <td class="value"><input type="text" size="64" name="ldapUserSearch" value="$Encoder.attributeEscape($FUSERSEARCH)"/></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.AddUserAuthColon'))</nobr></td>
+    <td class="value">
+  #if($FADDUSERRECORD)
+      <input type="checkbox" value="1" name="ldapAddUserRecord" checked="true"/>
+  #else
+      <input type="checkbox" value="1" name="ldapAddUserRecord"/>
+  #end
+    </td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.UserNameAttrColon'))</nobr></td>
+    <td class="value"><input type="text" size="64" name="ldapUserNameAttr" value="$Encoder.attributeEscape($FUSERNAMEATTR)"/></td>
+  </tr>
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.GroupSearchBaseColon'))</nobr></td>
+    <td class="value"><input type="text" size="64" name="ldapGroupBase" value="$Encoder.attributeEscape($FGROUPBASE)"/></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.GroupSearchFilterColon'))</nobr></td>
+    <td class="value"><input type="text" size="64" name="ldapGroupSearch" value="$Encoder.attributeEscape($FGROUPSEARCH)"/></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.GroupNameAttributeColon'))</nobr></td>
+    <td class="value"><input type="text" size="64" name="ldapGroupNameAttr" value="$Encoder.attributeEscape($FGROUPNAMEATTR)"/></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.GroupMemberDnColon'))</nobr></td>
+    <td class="value">
+  #if($FGROUPMEMBERDN)
+      <input type="checkbox" value="1" name="ldapGroupMemberDn" checked="true"/>
+  #else
+      <input type="checkbox" value="1" name="ldapGroupMemberDn"/>
+  #end
+    </td>
+  </tr>
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.SSLCertificateList'))</nobr>
+    </td>
+    <td class="value">
+      <input type="hidden" name="sslkeystorealias" value=""/>
+      <table class="displaytable">
+        #if($SSLCERTIFICATESMAP)
+          #foreach($cert in $SSLCERTIFICATESMAP.entrySet())
+        <tr>
+          <td class="description">
+            <input type="button" onclick='Javascript:SSLDeleteCertificate($Encoder.attributeJavascriptEscape($cert.Key))'
+                   alt="$Encoder.attributeEscape($ResourceBundle.getString('LDAP.DeleteCert')$cert.Key)"
+                   value="$Encoder.attributeEscape($ResourceBundle.getString('LDAP.Delete'))"/>
+          </td>
+          <td class="value">
+            $Encoder.bodyEscape($cert.Value)
+          </td>
+        </tr>
+          #end
+        #else
+        <tr>
+          <td class="message" colspan="2">
+            <nobr>$ResourceBundle.getString('LDAP.NoCertificatesPresent')</nobr>
+          </td>
+        </tr>
+        #end
+      </table>
+      <input type="button" onclick='Javascript:SSLAddCertificate()' alt="$Encoder.attributeEscape($ResourceBundle.getString('LDAP.AddCert'))"
+             value="$Encoder.attributeEscape($ResourceBundle.getString('LDAP.Add'))"/>&nbsp;
+      $Encoder.bodyEscape($ResourceBundle.getString('LDAP.Certificate'))
+      <input name="sslcertificate" size="50" type="file"/>
+    </td>
+  </tr>
+
+</table>
+#else
+<input type="hidden" name="ldapServerName" value="$Encoder.attributeEscape($FSERVERNAME)"/>
+<input type="hidden" name="ldapServerPort" value="$Encoder.attributeEscape($FSERVERPORT)"/>
+<input type="hidden" name="ldapServerBase" value="$Encoder.attributeEscape($FSERVERBASE)"/>
+<input type="hidden" name="ldapBindUser" value="$Encoder.attributeEscape($FBINDUSER)"/>
+<input type="hidden" name="ldapBindPass" value="$Encoder.attributeEscape($FBINDPASS)"/>
+<input type="hidden" name="ldapUserBase" value="$Encoder.attributeEscape($FUSERBASE)"/>
+<input type="hidden" name="ldapUserSearch" value="$Encoder.attributeEscape($FUSERSEARCH)"/>
+<input type="hidden" name="ldapGroupBase" value="$Encoder.attributeEscape($FGROUPBASE)"/>
+<input type="hidden" name="ldapGroupSearch" value="$Encoder.attributeEscape($FGROUPSEARCH)"/>
+<input type="hidden" name="ldapGroupNameAttr" value="$Encoder.attributeEscape($FGROUPNAMEATTR)"/>
+<input type="hidden" name="ldapUserNameAttr" value="$Encoder.attributeEscape($FUSERNAMEATTR)"/>
+  #if ($FADDUSERRECORD)
+<input type="hidden" name="ldapAddUserRecord" value="1"/>
+  #else
+<input type="hidden" name="ldapAddUserRecord" value="0"/>
+  #end
+  #if ($FGROUPMEMBERDN)
+<input type="hidden" name="ldapGroupMemberDn" value="1"/>
+  #else
+<input type="hidden" name="ldapGroupMemberDn" value="0"/>
+  #end
+#end
\ No newline at end of file

Propchange: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/editConfiguration_LDAP.html
------------------------------------------------------------------------------
    svn:keywords = Id

Added: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html?rev=1705286&view=auto
==============================================================================
--- manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html
(added)
+++ manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html
Fri Sep 25 12:41:06 2015
@@ -0,0 +1,133 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<table class="displaytable">
+  <tr><td class="separator" colspan="2"><hr/></td></tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.LDAPServerNameColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($FSERVERNAME)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.LDAPServerPortColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($FSERVERPORT)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.LDAPServerBaseColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($FSERVERBASE)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.LDAPBindUserColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($FBINDUSER)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.LDAPBindPasswordColon'))</nobr></td>
+    <td class="value">*******</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.UserSearchBaseColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($FUSERBASE)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.UserSearchFilterColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($FUSERSEARCH)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.AddUserAuthColon'))</nobr></td>
+    <td class="value">
+#if($FADDUSERRECORD)
+    $Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.Yes'))
+#else
+    $Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.No'))
+#end
+    </td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.UserNameAttrColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($FUSERNAMEATTR)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.GroupSearchBaseColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($FGROUPBASE)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.GroupSearchFilterColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($FGROUPSEARCH)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.GroupNameAttributeColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($FGROUPNAMEATTR)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.GroupMemberDnColon'))</nobr></td>
+    <td class="value">
+#if($FGROUPMEMBERDN)
+    $Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.Yes'))
+#else
+    $Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.No'))
+#end
+    </td>
+  </tr>
+
+  <tr><td class="separator" colspan="4"><hr/></td></tr>
+
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('LDAP.SSLCertificateList'))</nobr>
+    </td>
+    <td class="value">
+      <table class="displaytable">
+        #if($SSLCERTIFICATESMAP)
+          #foreach($cert in $SSLCERTIFICATESMAP.entrySet())
+        <tr>
+          <td class="description">
+            $Encoder.bodyEscape($cert.Key)
+          </td>
+          <td class="value">
+            $Encoder.bodyEscape($cert.Value)
+          </td>
+        </tr>
+          #end
+        #else
+        <tr>
+          <td class="message" colspan="2">
+            <nobr>$ResourceBundle.getString('LDAP.NoCertificatesPresent')</nobr>
+          </td>
+        </tr>
+        #end
+      </table>
+    </td>
+  </tr>
+
+  <tr><td class="separator" colspan="4"><hr/></td></tr>
+  
+#set($seenany = false)
+#foreach($forcedtoken in $FORCEDTOKENS)
+  #if(!$seenany)
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.ForcedTokensColon'))</nobr></td>
+    <td class="value">
+  #end
+  #set(#seenany = true)
+        $Encoder.bodyEscape($forcedtoken)<br/>
+#end
+#if($seenany)
+    </td>
+  </tr>
+#else
+  <tr><td class="message" colspan="4"><nobr>$Encoder.bodyEscape($ResourceBundle.getMessage('LDAP.NoTokensSpecified'))</nobr></td></tr>
+#end
+</table>

Propchange: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/branches/CONNECTORS-1244/connectors/ldap/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/ldap/viewConfiguration.html
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message