Author: kwright
Date: Sat Apr 15 00:33:26 2017
New Revision: 1791437
URL: http://svn.apache.org/viewvc?rev=1791437&view=rev
Log:
Fix password obfuscation issues
Modified:
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/nuxeo/NuxeoAuthorityConnector.java
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/nuxeo/NuxeoRepositoryConnector.java
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/nuxeo/editConfiguration_conf_server.html
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/nuxeo/viewConfiguration_conf.html
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/nuxeo/editConfiguration_conf_server.html
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/nuxeo/viewConfiguration_conf.html
Modified:
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/nuxeo/NuxeoAuthorityConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/nuxeo/NuxeoAuthorityConnector.java?rev=1791437&r1=1791436&r2=1791437&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/nuxeo/NuxeoAuthorityConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/nuxeo/NuxeoAuthorityConnector.java
Sat Apr 15 00:33:26 2017
@@ -229,7 +229,7 @@ public class NuxeoAuthorityConnector ext
String nuxeoPort = parameters.getParameter(NuxeoConfiguration.Server.PORT);
String nuxeoPath = parameters.getParameter(NuxeoConfiguration.Server.PATH);
String nuxeoUsername =
parameters.getParameter(NuxeoConfiguration.Server.USERNAME);
- String nuxeoPassword =
parameters.getParameter(NuxeoConfiguration.Server.PASSWORD);
+ String nuxeoPassword =
parameters.getObfuscatedParameter(NuxeoConfiguration.Server.PASSWORD);
if (nuxeoProtocol == null)
nuxeoProtocol = NuxeoConfiguration.Server.PROTOCOL_DEFAULT_VALUE;
@@ -244,7 +244,7 @@ public class NuxeoAuthorityConnector ext
if (nuxeoPassword == null)
nuxeoPassword = NuxeoConfiguration.Server.PASSWORD_DEFAULT_VALUE;
else
- nuxeoPassword = mapper.mapKeyToPassword(nuxeoPassword);
+ nuxeoPassword = mapper.mapPasswordToKey(nuxeoPassword);
serverMap.put(PARAMETER_PREFIX + NuxeoConfiguration.Server.PROTOCOL,
nuxeoProtocol);
serverMap.put(PARAMETER_PREFIX + NuxeoConfiguration.Server.HOST,
nuxeoHost);
Modified:
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/nuxeo/NuxeoRepositoryConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/nuxeo/NuxeoRepositoryConnector.java?rev=1791437&r1=1791436&r2=1791437&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/nuxeo/NuxeoRepositoryConnector.java
(original)
+++
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/nuxeo/NuxeoRepositoryConnector.java
Sat Apr 15 00:33:26 2017
@@ -199,7 +199,7 @@ public class NuxeoRepositoryConnector ex
String nuxeoPort = parameters.getParameter(NuxeoConfiguration.Server.PORT);
String nuxeoPath = parameters.getParameter(NuxeoConfiguration.Server.PATH);
String nuxeoUsername =
parameters.getParameter(NuxeoConfiguration.Server.USERNAME);
- String nuxeoPassword =
parameters.getParameter(NuxeoConfiguration.Server.PASSWORD);
+ String nuxeoPassword =
parameters.getObfuscatedParameter(NuxeoConfiguration.Server.PASSWORD);
if (nuxeoProtocol == null)
nuxeoProtocol = NuxeoConfiguration.Server.PROTOCOL_DEFAULT_VALUE;
@@ -214,7 +214,7 @@ public class NuxeoRepositoryConnector ex
if (nuxeoPassword == null)
nuxeoPassword = NuxeoConfiguration.Server.PASSWORD_DEFAULT_VALUE;
else
- nuxeoPassword = mapper.mapKeyToPassword(nuxeoPassword);
+ nuxeoPassword = mapper.mapPasswordToKey(nuxeoPassword);
serverMap.put(PARAMETER_PREFIX + NuxeoConfiguration.Server.PROTOCOL,
nuxeoProtocol);
serverMap.put(PARAMETER_PREFIX + NuxeoConfiguration.Server.HOST,
nuxeoHost);
Modified:
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/nuxeo/editConfiguration_conf_server.html
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/nuxeo/editConfiguration_conf_server.html?rev=1791437&r1=1791436&r2=1791437&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/nuxeo/editConfiguration_conf_server.html
(original)
+++
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/nuxeo/editConfiguration_conf_server.html
Sat Apr 15 00:33:26 2017
@@ -76,7 +76,7 @@ $ResourceBundle.getString('NuxeoAuthorit
</td>
<td class="value"><input size="16" type="password"
id="nuxeo_password" name="nuxeo_password"
- value="" /></td>
+ value="$Encoder.attributeEscape($NUXEO_PASSWORD)" /></td>
</tr>
</table>
Modified:
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/nuxeo/viewConfiguration_conf.html
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/nuxeo/viewConfiguration_conf.html?rev=1791437&r1=1791436&r2=1791437&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/nuxeo/viewConfiguration_conf.html
(original)
+++
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/authorities/authorities/nuxeo/viewConfiguration_conf.html
Sat Apr 15 00:33:26 2017
@@ -19,30 +19,30 @@
<tr>
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('NuxeoAuthorityConnector.Protocol'))</nobr>
</td>
- <td><nobr>$Encoder.bodyEscape($NUXEO_PROTOCOL)</nobr></td>
+ <td class="value"><nobr>$Encoder.bodyEscape($NUXEO_PROTOCOL)</nobr></td>
</tr>
<tr>
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('NuxeoAuthorityConnector.Host'))</nobr>
</td>
- <td><nobr>$Encoder.bodyEscape($NUXEO_HOST)</nobr></td>
+ <td class="value"><nobr>$Encoder.bodyEscape($NUXEO_HOST)</nobr></td>
</tr>
<tr>
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('NuxeoAuthorityConnector.Port'))</nobr>
</td>
- <td><nobr>$Encoder.bodyEscape($NUXEO_PORT)</nobr></td>
+ <td class="value"><nobr>$Encoder.bodyEscape($NUXEO_PORT)</nobr></td>
</tr>
<tr>
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('NuxeoAuthorityConnector.Path'))</nobr>
</td>
- <td><nobr>$Encoder.bodyEscape($NUXEO_PATH)</nobr></td>
+ <td class="value"><nobr>$Encoder.bodyEscape($NUXEO_PATH)</nobr></td>
</tr>
<tr>
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('NuxeoAuthorityConnector.Username'))</nobr>
</td>
- <td><nobr>$Encoder.bodyEscape($NUXEO_USERNAME)</nobr></td>
+ <td class="value"><nobr>$Encoder.bodyEscape($NUXEO_USERNAME)</nobr></td>
</tr>
<tr>
<td
class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('NuxeoAuthorityConnector.Password'))</nobr>
</td>
- <td><nobr>*****</nobr></td>
+ <td class="value"><nobr>*****</nobr></td>
</table>
\ No newline at end of file
Modified:
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/nuxeo/editConfiguration_conf_server.html
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/nuxeo/editConfiguration_conf_server.html?rev=1791437&r1=1791436&r2=1791437&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/nuxeo/editConfiguration_conf_server.html
(original)
+++
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/nuxeo/editConfiguration_conf_server.html
Sat Apr 15 00:33:26 2017
@@ -76,7 +76,7 @@ $ResourceBundle.getString('NuxeoReposito
</td>
<td class="value"><input size="16" type="password"
id="nuxeo_password" name="nuxeo_password"
- value="" /></td>
+ value="$Encoder.attributeEscape($NUXEO_PASSWORD)" /></td>
</tr>
</table>
@@ -93,6 +93,6 @@ $ResourceBundle.getString('NuxeoReposito
<input type="hidden" name="nuxeo_username"
value="$Encoder.attributeEscape($NUXEO_USERNAME)" />
<input type="hidden" name="nuxeo_password"
- value="" />
+ value="$Encoder.attributeEscape($NUXEO_PASSWORD)" />
#end
Modified:
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/nuxeo/viewConfiguration_conf.html
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/nuxeo/viewConfiguration_conf.html?rev=1791437&r1=1791436&r2=1791437&view=diff
==============================================================================
---
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/nuxeo/viewConfiguration_conf.html
(original)
+++
manifoldcf/branches/CONNECTORS-1290-2/connectors/nuxeo/connector/src/main/resources/org/apache/manifoldcf/crawler/connectors/nuxeo/viewConfiguration_conf.html
Sat Apr 15 00:33:26 2017
@@ -21,7 +21,7 @@
<td class="description">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('NuxeoRepositoryConnector.Protocol'))</nobr>
</td>
- <td>
+ <td class="value">
<nobr>$Encoder.bodyEscape($NUXEO_PROTOCOL)</nobr>
</td>
</tr>
@@ -29,7 +29,7 @@
<td class="description">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('NuxeoRepositoryConnector.Host'))</nobr>
</td>
- <td>
+ <td class="value">
<nobr>$Encoder.bodyEscape($NUXEO_HOST)</nobr>
</td>
</tr>
@@ -37,7 +37,7 @@
<td class="description">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('NuxeoRepositoryConnector.Port'))</nobr>
</td>
- <td>
+ <td class="value">
<nobr>$Encoder.bodyEscape($NUXEO_PORT)</nobr>
</td>
</tr>
@@ -45,7 +45,7 @@
<td class="description">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('NuxeoRepositoryConnector.Path'))</nobr>
</td>
- <td>
+ <td class="value">
<nobr>$Encoder.bodyEscape($NUXEO_PATH)</nobr>
</td>
</tr>
@@ -53,7 +53,7 @@
<td class="description">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('NuxeoRepositoryConnector.Username'))</nobr>
</td>
- <td>
+ <td class="value">
<nobr>$Encoder.bodyEscape($NUXEO_USERNAME)</nobr>
</td>
</tr>
@@ -61,7 +61,7 @@
<td class="description">
<nobr>$Encoder.bodyEscape($ResourceBundle.getString('NuxeoRepositoryConnector.Password'))</nobr>
</td>
- <td>
+ <td class="value">
<nobr>*****</nobr>
</td>
