You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by mg...@apache.org on 2007/12/29 17:07:09 UTC
svn commit: r607438 - in /cayenne/main/trunk/framework:
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/
cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/
cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/...
Author: mgentry
Date: Sat Dec 29 08:07:06 2007
New Revision: 607438
URL: http://svn.apache.org/viewvc?rev=607438&view=rev
Log:
Changed 'salt' to 'key' since salt is a more appropriate term for hashing, which is not what password encoding does.
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/ConfigSaver.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DriverDataSourceFactory.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/PasswordEncoding.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/PlainTextPasswordEncoder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot13PasswordEncoder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot47PasswordEncoder.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/JDBCDataSourceEditor.java
cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/JDBCDataSourceView.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/ConfigSaver.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/ConfigSaver.java?rev=607438&r1=607437&r2=607438&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/ConfigSaver.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/ConfigSaver.java Sat Dec 29 08:07:06 2007
@@ -195,7 +195,7 @@
if (encoder != null)
pw.print(attribute("password", encoder.encodePassword(
info.getPassword(),
- info.getPasswordEncoderSalt())));
+ info.getPasswordEncoderKey())));
}
else if (info.getPasswordLocation().equals(
DataSourceInfo.PASSWORD_LOCATION_CLASSPATH)) {
@@ -209,7 +209,7 @@
PrintStream out = new PrintStream(new FileOutputStream(
passwordFile));
out.print(encoder.encodePassword(info.getPassword(), info
- .getPasswordEncoderSalt()));
+ .getPasswordEncoderKey()));
out.close();
}
catch (FileNotFoundException exception) {
@@ -221,7 +221,7 @@
}
pw.println(attribute("encoderClass", info.getPasswordEncoderClass())
- + attribute("encoderSalt", info.getPasswordEncoderSalt())
+ + attribute("encoderKey", info.getPasswordEncoderKey())
+ attribute("passwordLocation", info.getPasswordLocation())
+ attribute("passwordSource", info.getPasswordSource())
+ "/>");
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DriverDataSourceFactory.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DriverDataSourceFactory.java?rev=607438&r1=607437&r2=607438&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DriverDataSourceFactory.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/DriverDataSourceFactory.java Sat Dec 29 08:07:06 2007
@@ -297,22 +297,22 @@
logger.info("loading user name and password.");
String encoderClass = atts.getValue("encoderClass");
- String encoderSalt = atts.getValue("encoderSalt");
+ String encoderKey = atts.getValue("encoderKey") == null ? atts.getValue("encoderSalt") : atts.getValue("encoderKey");
String password = atts.getValue("password");
String passwordLocation = atts.getValue("passwordLocation");
String passwordSource = atts.getValue("passwordSource");
String username = atts.getValue("userName");
driverInfo.setPasswordEncoderClass(encoderClass);
- driverInfo.setPasswordEncoderSalt(encoderSalt);
+ driverInfo.setPasswordEncoderKey(encoderKey);
driverInfo.setPasswordLocation(passwordLocation);
driverInfo.setPasswordSource(passwordSource);
driverInfo.setUserName(username);
// Replace {} in passwordSource with encoderSalt -- useful for EXECUTABLE &
// URL options
- if (encoderSalt != null) {
- passwordSource = passwordSource.replaceAll("\\{\\}", encoderSalt);
+ if (encoderKey != null) {
+ passwordSource = passwordSource.replaceAll("\\{\\}", encoderKey);
}
PasswordEncoding passwordEncoder = driverInfo.getPasswordEncoder();
@@ -359,7 +359,7 @@
if (password != null && passwordEncoder != null)
driverInfo.setPassword(passwordEncoder.decodePassword(
password,
- encoderSalt));
+ encoderKey));
}
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/PasswordEncoding.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/PasswordEncoding.java?rev=607438&r1=607437&r2=607438&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/PasswordEncoding.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/PasswordEncoding.java Sat Dec 29 08:07:06 2007
@@ -45,17 +45,19 @@
* Decodes an encoded database password.
*
* @param encodedPassword - The encoded password to be decoded
- * @param salt - An optional data element which can be used to salt the algorithm.
+ * @param key - An optional data element which can be used to unlock the password.
+ * Some encoders may require the key.
* @return The decoded normal/plain plassword.
*/
- public String decodePassword(String encodedPassword, String salt);
+ public String decodePassword(String encodedPassword, String key);
/**
* Encodes a normal/plain database password.
*
* @param normalPassword - The normal/plain password to be encoded
- * @param salt - An optional data element which can be used to salt the algorithm.
+ * @param key - An optional data element which can be used to lock the password.
+ * Some encoders may require the key.
* @return The encoded password.
*/
- public String encodePassword(String normalPassword, String salt);
+ public String encodePassword(String normalPassword, String key);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/PlainTextPasswordEncoder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/PlainTextPasswordEncoder.java?rev=607438&r1=607437&r2=607438&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/PlainTextPasswordEncoder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/PlainTextPasswordEncoder.java Sat Dec 29 08:07:06 2007
@@ -34,7 +34,7 @@
/* (non-Javadoc)
* @see org.apache.cayenne.conf.PasswordEncoding#decodePassword(java.lang.String, java.lang.String)
*/
- public String decodePassword(String encodedPassword, String salt)
+ public String decodePassword(String encodedPassword, String key)
{
return encodedPassword;
}
@@ -42,7 +42,7 @@
/* (non-Javadoc)
* @see org.apache.cayenne.conf.PasswordEncoding#encodePassword(java.lang.String, java.lang.String)
*/
- public String encodePassword(String normalPassword, String salt)
+ public String encodePassword(String normalPassword, String key)
{
return normalPassword;
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot13PasswordEncoder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot13PasswordEncoder.java?rev=607438&r1=607437&r2=607438&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot13PasswordEncoder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot13PasswordEncoder.java Sat Dec 29 08:07:06 2007
@@ -38,7 +38,7 @@
/* (non-Javadoc)
* @see org.apache.cayenne.conf.PasswordEncoding#decodePassword(java.lang.String, java.lang.String)
*/
- public String decodePassword(String encodedPassword, String salt)
+ public String decodePassword(String encodedPassword, String key)
{
return rotate(encodedPassword);
}
@@ -46,7 +46,7 @@
/* (non-Javadoc)
* @see org.apache.cayenne.conf.PasswordEncoding#encodePassword(java.lang.String, java.lang.String)
*/
- public String encodePassword(String normalPassword, String salt)
+ public String encodePassword(String normalPassword, String key)
{
return rotate(normalPassword);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot47PasswordEncoder.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot47PasswordEncoder.java?rev=607438&r1=607437&r2=607438&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot47PasswordEncoder.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conf/Rot47PasswordEncoder.java Sat Dec 29 08:07:06 2007
@@ -36,7 +36,7 @@
/* (non-Javadoc)
* @see org.apache.cayenne.conf.PasswordEncoding#decodePassword(java.lang.String, java.lang.String)
*/
- public String decodePassword(String encodedPassword, String salt)
+ public String decodePassword(String encodedPassword, String key)
{
return rotate(encodedPassword);
}
@@ -44,7 +44,7 @@
/* (non-Javadoc)
* @see org.apache.cayenne.conf.PasswordEncoding#encodePassword(java.lang.String, java.lang.String)
*/
- public String encodePassword(String normalPassword, String salt)
+ public String encodePassword(String normalPassword, String key)
{
return rotate(normalPassword);
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java?rev=607438&r1=607437&r2=607438&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/conn/DataSourceInfo.java Sat Dec 29 08:07:06 2007
@@ -52,12 +52,12 @@
// Extended parameters
protected String passwordEncoderClass = PasswordEncoding.standardEncoders[0];
- protected String passwordEncoderSalt = "";
+ protected String passwordEncoderKey = "";
+ protected String passwordLocation = PASSWORD_LOCATION_MODEL;
protected String passwordSourceExecutable = "";
protected String passwordSourceFilename = "";
protected String passwordSourceModel = "Not Applicable";
protected String passwordSourceUrl = "";
- protected String passwordLocation = PASSWORD_LOCATION_MODEL;
public boolean equals(Object obj) {
if (obj == this)
@@ -87,7 +87,7 @@
return false;
if (!Util.nullSafeEquals(this.passwordEncoderClass, dsi.passwordEncoderClass))
return false;
- if (!Util.nullSafeEquals(this.passwordEncoderSalt, dsi.passwordEncoderSalt))
+ if (!Util.nullSafeEquals(this.passwordEncoderKey, dsi.passwordEncoderKey))
return false;
if (!Util.nullSafeEquals(this.passwordSourceFilename, dsi.passwordSourceFilename))
return false;
@@ -130,7 +130,7 @@
if (!PlainTextPasswordEncoder.class.getName().equals(passwordEncoderClass)) {
buf.append("\n encoder class: ").append(passwordEncoderClass).append(
- "\n encoder salt: ").append(passwordEncoderSalt);
+ "\n encoder key: ").append(passwordEncoderKey);
}
if (!PASSWORD_LOCATION_MODEL.equals(passwordLocation)) {
@@ -244,17 +244,17 @@
}
/**
- * @return the passwordEncoderSalt
+ * @return the passwordEncoderKey
*/
- public String getPasswordEncoderSalt() {
- return passwordEncoderSalt;
+ public String getPasswordEncoderKey() {
+ return passwordEncoderKey;
}
/**
- * @param passwordEncoderSalt the passwordEncoderSalt to set
+ * @param passwordEncoderKey the passwordEncoderKey to set
*/
- public void setPasswordEncoderSalt(String passwordEncoderSalt) {
- this.passwordEncoderSalt = passwordEncoderSalt;
+ public void setPasswordEncoderKey(String passwordEncoderKey) {
+ this.passwordEncoderKey = passwordEncoderKey;
}
/**
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/JDBCDataSourceEditor.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/JDBCDataSourceEditor.java?rev=607438&r1=607437&r2=607438&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/JDBCDataSourceEditor.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/JDBCDataSourceEditor.java Sat Dec 29 08:07:06 2007
@@ -67,7 +67,7 @@
fieldAdapters[6] =
builder.bindToComboSelection(view.getPasswordEncoder(), "node.dataSource.dataSourceInfo.passwordEncoderClass");
fieldAdapters[7] =
- builder.bindToTextField(view.getPasswordSalt(), "node.dataSource.dataSourceInfo.passwordEncoderSalt");
+ builder.bindToTextField(view.getPasswordKey(), "node.dataSource.dataSourceInfo.passwordEncoderKey");
fieldAdapters[8] =
builder.bindToComboSelection(view.getPasswordLocation(), "node.dataSource.dataSourceInfo.passwordLocation");
fieldAdapters[9] =
Modified: cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/JDBCDataSourceView.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/JDBCDataSourceView.java?rev=607438&r1=607437&r2=607438&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/JDBCDataSourceView.java (original)
+++ cayenne/main/trunk/framework/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/datanode/JDBCDataSourceView.java Sat Dec 29 08:07:06 2007
@@ -53,7 +53,7 @@
protected JPasswordField password;
protected JComboBox passwordEncoder;
protected JComboBox passwordLocation;
- protected JTextField passwordSalt;
+ protected JTextField passwordKey;
protected JTextField passwordSource;
protected JLabel passwordSourceLabel;
protected JTextField minConnections;
@@ -71,7 +71,7 @@
DataSourceInfo.PASSWORD_LOCATION_EXECUTABLE,
DataSourceInfo.PASSWORD_LOCATION_URL };
- private static final Map passwordSourceLabels = new TreeMap();
+ private static final Map<String, String> passwordSourceLabels = new TreeMap<String, String>();
static
{
@@ -108,7 +108,7 @@
passwordEncoder = new JComboBox();
passwordLocation = new JComboBox();
passwordSource = new JTextField();
- passwordSalt = new JTextField();
+ passwordKey = new JTextField();
minConnections = new JTextField(6);
maxConnections = new JTextField(6);
syncWithLocal = new JButton("Sync with Local");
@@ -158,10 +158,10 @@
builder.addLabel("Password Encoder:", cc.xy(1, 11));
builder.add(passwordEncoder, cc.xywh(3, 11, 5, 1));
- builder.addLabel("Password Salt:", cc.xy(1, 13));
- builder.add(passwordSalt, cc.xywh(3, 13, 5, 1));
+ builder.addLabel("Password Encoder Key:", cc.xy(1, 13));
+ builder.add(passwordKey, cc.xywh(3, 13, 5, 1));
- builder.addLabel("Cayenne supplied encoders do not require salting", cc.xywh(3, 15, 5, 1));
+ builder.addLabel("Note: Cayenne supplied encoders do not use a key.", cc.xywh(3, 15, 5, 1));
builder.addLabel("Password Location:", cc.xy(1, 17));
builder.add(passwordLocation, cc.xywh(3, 17, 5, 1));
@@ -226,11 +226,11 @@
}
/**
- * @return the passwordSalt
+ * @return the passwordKey
*/
- public JTextField getPasswordSalt()
+ public JTextField getPasswordKey()
{
- return passwordSalt;
+ return passwordKey;
}
/**