public
Created

  • Download Gist
gistfile1.diff
Diff
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229
Index: src/main/java/org/jasypt/hibernate4/connectionprovider/EncryptedPasswordC3P0ConnectionProvider.java
===================================================================
--- src/main/java/org/jasypt/hibernate4/connectionprovider/EncryptedPasswordC3P0ConnectionProvider.java (revision 609)
+++ src/main/java/org/jasypt/hibernate4/connectionprovider/EncryptedPasswordC3P0ConnectionProvider.java (working copy)
@@ -19,6 +19,7 @@
*/
package org.jasypt.hibernate4.connectionprovider;
+import java.util.Map;
import java.util.Properties;
import org.hibernate.cfg.AvailableSettings;
@@ -94,58 +95,51 @@
public EncryptedPasswordC3P0ConnectionProvider() {
super();
}
-
-
- public void configure(final Properties props) {
-
- final String encryptorRegisteredName =
- props.getProperty(ParameterNaming.ENCRYPTOR_REGISTERED_NAME);
-
- final HibernatePBEEncryptorRegistry encryptorRegistry =
- HibernatePBEEncryptorRegistry.getInstance();
- final PBEStringEncryptor encryptor =
- encryptorRegistry.getPBEStringEncryptor(encryptorRegisteredName);
-
- if (encryptor == null) {
- throw new EncryptionInitializationException(
- "No string encryptor registered for hibernate " +
- "with name \"" + encryptorRegisteredName + "\"");
- }
- // Get the original values, which may be encrypted
- final String driver = props.getProperty(AvailableSettings.DRIVER);
- final String url = props.getProperty(AvailableSettings.URL);
- final String user = props.getProperty(AvailableSettings.USER);
- final String password = props.getProperty(AvailableSettings.PASS);
+ public void configure(Map props) {
+ final String encryptorRegisteredName =
+ (String)props.get(ParameterNaming.ENCRYPTOR_REGISTERED_NAME);
- // Perform decryption operations as needed and store the new values
- if (PropertyValueEncryptionUtils.isEncryptedValue(driver)) {
- props.setProperty(
- AvailableSettings.DRIVER,
- PropertyValueEncryptionUtils.decrypt(driver, encryptor));
- }
- if (PropertyValueEncryptionUtils.isEncryptedValue(url)) {
- props.setProperty(
- AvailableSettings.URL,
- PropertyValueEncryptionUtils.decrypt(url, encryptor));
- }
- if (PropertyValueEncryptionUtils.isEncryptedValue(user)) {
- props.setProperty(
- AvailableSettings.USER,
- PropertyValueEncryptionUtils.decrypt(user, encryptor));
- }
- if (PropertyValueEncryptionUtils.isEncryptedValue(password)) {
- props.setProperty(
- AvailableSettings.PASS,
- PropertyValueEncryptionUtils.decrypt(password, encryptor));
- }
-
- // Let Hibernate do the rest
- super.configure(props);
-
- }
+ final HibernatePBEEncryptorRegistry encryptorRegistry =
+ HibernatePBEEncryptorRegistry.getInstance();
+ final PBEStringEncryptor encryptor =
+ encryptorRegistry.getPBEStringEncryptor(encryptorRegisteredName);
-
-
-
+ if (encryptor == null) {
+ throw new EncryptionInitializationException(
+ "No string encryptor registered for hibernate " +
+ "with name \"" + encryptorRegisteredName + "\"");
+ }
+
+ // Get the original values, which may be encrypted
+ final String driver = (String)props.get(AvailableSettings.DRIVER);
+ final String url = (String)props.get(AvailableSettings.URL);
+ final String user = (String)props.get(AvailableSettings.USER);
+ final String password = (String)props.get(AvailableSettings.PASS);
+
+ // Perform decryption operations as needed and store the new values
+ if (PropertyValueEncryptionUtils.isEncryptedValue(driver)) {
+ props.put(
+ AvailableSettings.DRIVER,
+ PropertyValueEncryptionUtils.decrypt(driver, encryptor));
+ }
+ if (PropertyValueEncryptionUtils.isEncryptedValue(url)) {
+ props.put(
+ AvailableSettings.URL,
+ PropertyValueEncryptionUtils.decrypt(url, encryptor));
+ }
+ if (PropertyValueEncryptionUtils.isEncryptedValue(user)) {
+ props.put(
+ AvailableSettings.USER,
+ PropertyValueEncryptionUtils.decrypt(user, encryptor));
+ }
+ if (PropertyValueEncryptionUtils.isEncryptedValue(password)) {
+ props.put(
+ AvailableSettings.PASS,
+ PropertyValueEncryptionUtils.decrypt(password, encryptor));
+ }
+
+ // Let Hibernate do the rest
+ super.configure(props);
+ }
}
Index: src/main/java/org/jasypt/hibernate4/connectionprovider/EncryptedPasswordDriverManagerConnectionProvider.java
===================================================================
--- src/main/java/org/jasypt/hibernate4/connectionprovider/EncryptedPasswordDriverManagerConnectionProvider.java (revision 609)
+++ src/main/java/org/jasypt/hibernate4/connectionprovider/EncryptedPasswordDriverManagerConnectionProvider.java (working copy)
@@ -19,6 +19,7 @@
*/
package org.jasypt.hibernate4.connectionprovider;
+import java.util.Map;
import java.util.Properties;
import org.hibernate.cfg.AvailableSettings;
@@ -92,57 +93,53 @@
public EncryptedPasswordDriverManagerConnectionProvider() {
super();
}
-
-
- public void configure(final Properties props) {
-
- final String encryptorRegisteredName =
- props.getProperty(ParameterNaming.ENCRYPTOR_REGISTERED_NAME);
-
- final HibernatePBEEncryptorRegistry encryptorRegistry =
- HibernatePBEEncryptorRegistry.getInstance();
- final PBEStringEncryptor encryptor =
- encryptorRegistry.getPBEStringEncryptor(encryptorRegisteredName);
-
- if (encryptor == null) {
- throw new EncryptionInitializationException(
- "No string encryptor registered for hibernate " +
- "with name \"" + encryptorRegisteredName + "\"");
- }
+ public void configure(Map props) {
+ final String encryptorRegisteredName =
+ (String)props.get(ParameterNaming.ENCRYPTOR_REGISTERED_NAME);
- // Get the original values, which may be encrypted
- final String driver = props.getProperty(AvailableSettings.DRIVER);
- final String url = props.getProperty(AvailableSettings.URL);
- final String user = props.getProperty(AvailableSettings.USER);
- final String password = props.getProperty(AvailableSettings.PASS);
+ final HibernatePBEEncryptorRegistry encryptorRegistry =
+ HibernatePBEEncryptorRegistry.getInstance();
+ final PBEStringEncryptor encryptor =
+ encryptorRegistry.getPBEStringEncryptor(encryptorRegisteredName);
- // Perform decryption operations as needed and store the new values
- if (PropertyValueEncryptionUtils.isEncryptedValue(driver)) {
- props.setProperty(
- AvailableSettings.DRIVER,
- PropertyValueEncryptionUtils.decrypt(driver, encryptor));
- }
- if (PropertyValueEncryptionUtils.isEncryptedValue(url)) {
- props.setProperty(
- AvailableSettings.URL,
- PropertyValueEncryptionUtils.decrypt(url, encryptor));
- }
- if (PropertyValueEncryptionUtils.isEncryptedValue(user)) {
- props.setProperty(
- AvailableSettings.USER,
- PropertyValueEncryptionUtils.decrypt(user, encryptor));
- }
- if (PropertyValueEncryptionUtils.isEncryptedValue(password)) {
- props.setProperty(
- AvailableSettings.PASS,
- PropertyValueEncryptionUtils.decrypt(password, encryptor));
- }
-
- // Let Hibernate process
- super.configure(props);
-
- }
+ if (encryptor == null) {
+ throw new EncryptionInitializationException(
+ "No string encryptor registered for hibernate " +
+ "with name \"" + encryptorRegisteredName + "\"");
+ }
+ // Get the original values, which may be encrypted
+ final String driver = (String)props.get(AvailableSettings.DRIVER);
+ final String url = (String)props.get(AvailableSettings.URL);
+ final String user = (String)props.get(AvailableSettings.USER);
+ final String password = (String)props.get(AvailableSettings.PASS);
+
+ // Perform decryption operations as needed and store the new values
+ if (PropertyValueEncryptionUtils.isEncryptedValue(driver)) {
+ props.put(
+ AvailableSettings.DRIVER,
+ PropertyValueEncryptionUtils.decrypt(driver, encryptor));
+ }
+ if (PropertyValueEncryptionUtils.isEncryptedValue(url)) {
+ props.put(
+ AvailableSettings.URL,
+ PropertyValueEncryptionUtils.decrypt(url, encryptor));
+ }
+ if (PropertyValueEncryptionUtils.isEncryptedValue(user)) {
+ props.put(
+ AvailableSettings.USER,
+ PropertyValueEncryptionUtils.decrypt(user, encryptor));
+ }
+ if (PropertyValueEncryptionUtils.isEncryptedValue(password)) {
+ props.put(
+ AvailableSettings.PASS,
+ PropertyValueEncryptionUtils.decrypt(password, encryptor));
+ }
+
+ // Let Hibernate process
+ super.configure(props);
+ }
+

Please sign in to comment on this gist.

Something went wrong with that request. Please try again.