Revision 2:dcd717e1bcae
pom.xml | ||
---|---|---|
39 | 39 |
<artifactId>maven-compiler-plugin</artifactId> |
40 | 40 |
<version>2.3.2</version> |
41 | 41 |
<configuration> |
42 |
<source>1.6</source>
|
|
43 |
<target>1.6</target>
|
|
42 |
<source>1.5</source>
|
|
43 |
<target>1.5</target>
|
|
44 | 44 |
</configuration> |
45 | 45 |
</plugin> |
46 | 46 |
</plugins> |
... | ... | |
362 | 362 |
<artifactId>jtds</artifactId> |
363 | 363 |
<version>1.2.2</version> |
364 | 364 |
</dependency> |
365 |
<dependency> |
|
366 |
<groupId>commons-lang</groupId> |
|
367 |
<artifactId>commons-lang</artifactId> |
|
368 |
<version>2.5</version> |
|
369 |
</dependency> |
|
365 | 370 |
</dependencies> |
366 | 371 |
</project> |
src/my/com/upass/ConfigBean.java | ||
---|---|---|
11 | 11 |
|
12 | 12 |
package my.com.upass; |
13 | 13 |
|
14 |
import org.apache.commons.lang.StringUtils; |
|
15 |
|
|
14 | 16 |
/** |
15 | 17 |
* @author penril |
16 | 18 |
* |
... | ... | |
281 | 283 |
} |
282 | 284 |
public void setPasswordValidPattern(String passwordValidPattern) { |
283 | 285 |
//this will ensure that if the pattern is empty string, it is always set to null to represent no value is set |
284 |
if (passwordValidPattern!=null && passwordValidPattern.isEmpty()) {
|
|
286 |
if (StringUtils.isEmpty(passwordValidPattern)) {
|
|
285 | 287 |
passwordValidPattern = null; |
286 | 288 |
} |
287 | 289 |
this.passwordValidPattern = passwordValidPattern; |
... | ... | |
342 | 344 |
public void setPasswordAcceptPattern(String passwordAcceptPattern) { |
343 | 345 |
|
344 | 346 |
//this will ensure that if the pattern is empty string, it is always set to null to represent no value is set |
345 |
if (passwordAcceptPattern!=null && passwordAcceptPattern.isEmpty()) {
|
|
347 |
if (StringUtils.isEmpty(passwordAcceptPattern)) {
|
|
346 | 348 |
passwordAcceptPattern = null; |
347 | 349 |
} |
348 | 350 |
|
src/my/com/upass/dao/hibernate/ConfigurationDAOHibernate.java | ||
---|---|---|
17 | 17 |
import my.com.upass.pojo.ConfigurationBean; |
18 | 18 |
import net.penril.generic.hibernate.GenericDAOHibernate; |
19 | 19 |
|
20 |
import org.apache.commons.lang.StringUtils; |
|
20 | 21 |
import org.apache.log4j.Logger; |
21 | 22 |
import org.hibernate.Criteria; |
22 | 23 |
import org.hibernate.HibernateException; |
... | ... | |
72 | 73 |
/* (non-Javadoc) |
73 | 74 |
* @see my.com.upass.dao.ConfigurationDAO#isConfigChanged() |
74 | 75 |
*/ |
75 |
@Override |
|
76 | 76 |
public boolean isConfigChanged() { |
77 | 77 |
Session session = null; |
78 | 78 |
boolean isChanged = false; |
... | ... | |
92 | 92 |
} |
93 | 93 |
|
94 | 94 |
String flag = configurations.getConfigValue(); |
95 |
if (flag==null || flag.isEmpty()) {
|
|
95 |
if (StringUtils.isEmpty(flag)) {
|
|
96 | 96 |
return isChanged = true; //not set, assumed to be true to play safe |
97 | 97 |
} |
98 | 98 |
|
... | ... | |
118 | 118 |
return isChanged; |
119 | 119 |
} |
120 | 120 |
|
121 |
@Override |
|
122 | 121 |
public ConfigurationBean getTbAmConfigByConfigName (String configName) throws Exception |
123 | 122 |
{ |
124 | 123 |
ConfigurationBean tbAmConfig; |
... | ... | |
157 | 156 |
* @see net.penril.ibss.core.TbAmConfigDAO#getTbAmConfigByapplicationId(int) |
158 | 157 |
*/ |
159 | 158 |
@SuppressWarnings("unchecked") |
160 |
@Override |
|
161 | 159 |
public List<ConfigurationBean> getTbAmConfigByapplicationId(int applicationId) |
162 | 160 |
throws Exception { |
163 | 161 |
List<ConfigurationBean> tbAmConfig; |
... | ... | |
243 | 241 |
/* (non-Javadoc) |
244 | 242 |
* @see my.com.upass.dao.ConfigurationDAO#isConfigChanged() |
245 | 243 |
*/ |
246 |
@Override |
|
247 | 244 |
public void updateConfigChange() throws Exception { |
248 | 245 |
Session session = null; |
249 | 246 |
|
... | ... | |
279 | 276 |
} |
280 | 277 |
} |
281 | 278 |
|
282 |
@Override |
|
283 | 279 |
public void updateMkPendingByApplicationId(int applicationId, int mkPending) throws Exception { |
284 | 280 |
|
285 | 281 |
List<ConfigurationBean> tbAmConfig; |
src/my/com/upass/dao/hibernate/UserBackupDAOHibernate.java | ||
---|---|---|
29 | 29 |
GenericDAOHibernate<UserBeanBackup, Integer> implements |
30 | 30 |
TbAmUserBackupDAO |
31 | 31 |
{ |
32 |
@Override |
|
33 | 32 |
public UserBeanBackup getTbAmUserBackupByUserAlias (String uUserAlias) |
34 | 33 |
throws Exception |
35 | 34 |
{ |
src/my/com/upass/dao/hibernate/UserDAOHibernate.java | ||
---|---|---|
40 | 40 |
/** |
41 | 41 |
* @see my.com.upass.dao.UserDAO#getUserFromStore(java.lang.String, int) |
42 | 42 |
*/ |
43 |
@Override |
|
44 | 43 |
public UserBean getUserFromStore (String userAlias, int sqlMode) |
45 | 44 |
{ |
46 | 45 |
UserBean profile = null; |
... | ... | |
85 | 84 |
/** |
86 | 85 |
* @see my.com.upass.dao.UserDAO#getUserFromStore(java.lang.String) |
87 | 86 |
*/ |
88 |
@Override |
|
89 | 87 |
public UserBean getUserFromStore (String userAlias) |
90 | 88 |
{ |
91 | 89 |
return getUserFromStore (userAlias, Constants.MODE_QUSERBEAN); |
... | ... | |
94 | 92 |
/** |
95 | 93 |
* @see my.com.upass.dao.UserDAO#updateUserToStore(my.com.upass.pojo.UserBean) |
96 | 94 |
*/ |
97 |
@Override |
|
98 | 95 |
public boolean updateUserToStore (UserBean userBean) |
99 | 96 |
{ |
100 | 97 |
boolean isUpdated = false; |
... | ... | |
132 | 129 |
/** |
133 | 130 |
* @see my.com.upass.dao.UserDAO#insertUserToStore(my.com.upass.pojo.UserBean) |
134 | 131 |
*/ |
135 |
@Override |
|
136 | 132 |
public boolean insertUserToStore (UserBean userBean) |
137 | 133 |
{ |
138 | 134 |
boolean isCreated = false; |
... | ... | |
170 | 166 |
/** |
171 | 167 |
* @see my.com.upass.dao.UserDAO#updateUserToStore(my.com.upass.pojo.UserBean) |
172 | 168 |
*/ |
173 |
@Override |
|
174 | 169 |
public boolean deleteUser (UserBean userBean) |
175 | 170 |
{ |
176 | 171 |
boolean isUpdated = false; |
... | ... | |
208 | 203 |
/** |
209 | 204 |
* @see my.com.upass.dao.UserDAO#insertUserToStore(my.com.upass.pojo.UserBean) |
210 | 205 |
*/ |
211 |
@Override |
|
212 | 206 |
public boolean insertUserToBackupStore (UserBeanBackup userBean) |
213 | 207 |
{ |
214 | 208 |
boolean isCreated = false; |
... | ... | |
272 | 266 |
return profile; |
273 | 267 |
} |
274 | 268 |
|
275 |
@Override |
|
276 | 269 |
public UserBean getTbAmUserByUserAlias (String userAlias) throws Exception |
277 | 270 |
{ |
278 | 271 |
UserBean TbAmUser; |
src/my/com/upass/dao/hibernate/UserGemaltoDAOHibernate.java | ||
---|---|---|
28 | 28 |
/** |
29 | 29 |
* @see my.com.upass.dao.UserGemaltoDAO#insertTokenToStore(my.com.upass.TokenBean) |
30 | 30 |
*/ |
31 |
@Override |
|
32 | 31 |
public boolean insertTokenToStore(UserTokenBean userTokenBean) |
33 | 32 |
{ |
34 | 33 |
Session session = null; |
... | ... | |
66 | 65 |
/** |
67 | 66 |
* @see my.com.upass.dao.UserGemaltoDAO#updateTokenToStore(my.com.upass.TokenBean) |
68 | 67 |
*/ |
69 |
@Override |
|
70 | 68 |
public boolean updateTokenToStore(UserTokenBean userTokenBean) |
71 | 69 |
{ |
72 | 70 |
Session session = null; |
... | ... | |
100 | 98 |
/** |
101 | 99 |
* @see my.com.upass.dao.UserGemaltoDAO#getTokenFromStoreBySerialNumber(java.lang.String) |
102 | 100 |
*/ |
103 |
@Override |
|
104 | 101 |
public UserTokenBean getTokenFromStoreBySerialNumber(String serialNumber) |
105 | 102 |
{ |
106 | 103 |
UserTokenBean userTokenBean = null; |
... | ... | |
128 | 125 |
/** |
129 | 126 |
* @see my.com.upass.dao.UserGemaltoDAO#getTokenFromStoreByUserAlias(java.lang.String) |
130 | 127 |
*/ |
131 |
@Override |
|
132 | 128 |
public UserTokenBean getTokenFromStoreByUserAlias(String userAlias) |
133 | 129 |
{ |
134 | 130 |
UserTokenBean userTokenBean = null; |
... | ... | |
161 | 157 |
/** |
162 | 158 |
* @see my.com.upass.dao.UserGemaltoDAO#deleteTokenFromStoreBySerialNumber(java.lang.String) |
163 | 159 |
*/ |
164 |
@Override |
|
165 | 160 |
public boolean deleteTokenFromStoreBySerialNumber(String serialNumber) |
166 | 161 |
{ |
167 | 162 |
Session session = null; |
... | ... | |
196 | 191 |
/* (non-Javadoc) |
197 | 192 |
* @see my.com.upass.dao.UserTokenDAO#getTokenListFromStoreByCriterias(java.lang.String, java.lang.String) |
198 | 193 |
*/ |
199 |
@Override |
|
200 | 194 |
public int getTokenListSizeFromStoreByCriteria(String batchNumber, |
201 | 195 |
String serialNumber) throws Exception { |
202 | 196 |
|
... | ... | |
238 | 232 |
* @see my.com.upass.dao.UserTokenDAO#getTokenListFromStoreByCriterias(java.lang.String, java.lang.String) |
239 | 233 |
*/ |
240 | 234 |
@SuppressWarnings("unchecked") |
241 |
@Override |
|
242 | 235 |
public List<UserTokenBean> getTokenListFromStoreByCriteria(String batchNumber, |
243 | 236 |
String serialNumber, int startIndex, int rowPerPage) throws Exception { |
244 | 237 |
|
src/my/com/upass/dao/hibernate/UserSecureMetricDAOHibernate.java | ||
---|---|---|
63 | 63 |
* For SM, this method is not needed to implement as they have their own API |
64 | 64 |
* to store the token when performing token upload |
65 | 65 |
*/ |
66 |
@Override |
|
67 | 66 |
public boolean insertTokenToStore(UserTokenBean userTokenBean) { |
68 | 67 |
return false; |
69 | 68 |
} |
... | ... | |
71 | 70 |
/* (non-Javadoc) |
72 | 71 |
* @see my.com.upass.dao.UserTokenDAO#updateTokenToStore(my.com.upass.pojo.UserTokenBean) |
73 | 72 |
*/ |
74 |
@Override |
|
75 | 73 |
public boolean updateTokenToStore(UserTokenBean userTokenBean) { |
76 | 74 |
// TODO Auto-generated method stub |
77 | 75 |
return false; |
... | ... | |
80 | 78 |
/* (non-Javadoc) |
81 | 79 |
* @see my.com.upass.dao.UserTokenDAO#getTokenFromStoreBySerialNumber(java.lang.String) |
82 | 80 |
*/ |
83 |
@Override |
|
84 | 81 |
public UserTokenBean getTokenFromStoreBySerialNumber(String serialNumber) { |
85 | 82 |
|
86 | 83 |
UserTokenBean tokenBean = new UserTokenBean(); |
... | ... | |
104 | 101 |
/* (non-Javadoc) |
105 | 102 |
* @see my.com.upass.dao.UserTokenDAO#getTokenFromStoreByUserAlias(java.lang.String) |
106 | 103 |
*/ |
107 |
@Override |
|
108 | 104 |
public UserTokenBean getTokenFromStoreByUserAlias(String userAlias) { |
109 | 105 |
// TODO Auto-generated method stub |
110 | 106 |
return null; |
... | ... | |
113 | 109 |
/* (non-Javadoc) |
114 | 110 |
* @see my.com.upass.dao.UserTokenDAO#deleteTokenFromStoreBySerialNumber(java.lang.String) |
115 | 111 |
*/ |
116 |
@Override |
|
117 | 112 |
public boolean deleteTokenFromStoreBySerialNumber(String serialNumber) { |
118 | 113 |
|
119 | 114 |
boolean isDeleted = true; |
... | ... | |
133 | 128 |
* |
134 | 129 |
* required SM to provide additional API for this method for better improvement |
135 | 130 |
*/ |
136 |
@Override |
|
137 | 131 |
public int getTokenListSizeFromStoreByCriteria(String batchNumber, |
138 | 132 |
String serialNumber) throws Exception { |
139 | 133 |
|
... | ... | |
183 | 177 |
* |
184 | 178 |
* required SM to provide additional API for this method for better improvement |
185 | 179 |
*/ |
186 |
@Override |
|
187 | 180 |
public List<UserTokenBean> getTokenListFromStoreByCriteria( |
188 | 181 |
String batchNumber, String serialNumber, int startIndex, |
189 | 182 |
int rowPerPage) throws Exception { |
... | ... | |
250 | 243 |
* This method is specifically for Vasco only |
251 | 244 |
* |
252 | 245 |
*/ |
253 |
@Override |
|
254 | 246 |
public void insertVascoToken(List<UserTokenBean> tokens) throws Exception { |
255 | 247 |
|
256 | 248 |
} |
... | ... | |
258 | 250 |
/* (non-Javadoc) |
259 | 251 |
* @see my.com.upass.dao.UserTokenDAO#enquireTokenByUserId(java.lang.String) |
260 | 252 |
*/ |
261 |
@Override |
|
262 | 253 |
public UserTokenBean enquireTokenByUserId(String p_sUserId) |
263 | 254 |
throws Exception { |
264 | 255 |
// TODO Auto-generated method stub |
... | ... | |
268 | 259 |
/* (non-Javadoc) |
269 | 260 |
* @see my.com.upass.dao.UserTokenDAO#checkTokenExistenceBySerialNumber(java.lang.String) |
270 | 261 |
*/ |
271 |
@Override |
|
272 | 262 |
public boolean checkTokenExistenceBySerialNumber(String serial) |
273 | 263 |
throws Exception { |
274 | 264 |
|
... | ... | |
290 | 280 |
* |
291 | 281 |
* required SM to provide additional API for this method for better improvement |
292 | 282 |
*/ |
293 |
@Override |
|
294 | 283 |
public List<UserTokenBean> getTokenList(String batch, String serial) throws Exception { |
295 | 284 |
|
296 | 285 |
List<UserTokenBean> resultList = new ArrayList<UserTokenBean>(); |
src/my/com/upass/dao/hibernate/UserSecurityCodeDAOHibernate.java | ||
---|---|---|
40 | 40 |
/** |
41 | 41 |
* @see my.com.upass.dao.UserSecurityCodeDAO#getSecurityCodeFromStore(java.lang.String) |
42 | 42 |
*/ |
43 |
@Override |
|
44 | 43 |
public SecurityCodeBean getSecurityCodeFromStore (String referenceId) |
45 | 44 |
{ |
46 | 45 |
SecurityCodeBean tac = null; |
... | ... | |
71 | 70 |
/** |
72 | 71 |
* @see my.com.upass.dao.UserSecurityCodeDAO#updateSecurityCodeToStore(my.com.upass.pojo.SecurityCodeBean) |
73 | 72 |
*/ |
74 |
@Override |
|
75 | 73 |
public boolean updateSecurityCodeToStore (SecurityCodeBean tacBean) |
76 | 74 |
{ |
77 | 75 |
boolean isUpdated = false; |
src/my/com/upass/dao/hibernate/UserTacDAOHibernate.java | ||
---|---|---|
37 | 37 |
/** |
38 | 38 |
* @see my.com.upass.dao.UserTacDAO#getTacFromStore(java.lang.String, int) |
39 | 39 |
*/ |
40 |
@Override |
|
41 | 40 |
public TacBean getTacFromStore(String userAlias, int appId) { |
42 | 41 |
|
43 | 42 |
TacBean tac = null; |
... | ... | |
67 | 66 |
/** |
68 | 67 |
* @see my.com.upass.dao.UserTacDAO#updateTacToStore(my.com.upass.pojo.TacBean) |
69 | 68 |
*/ |
70 |
@Override |
|
71 | 69 |
public boolean updateTacToStore(TacBean tacBean) { |
72 | 70 |
boolean isUpdated = false; |
73 | 71 |
Session session = null; |
src/my/com/upass/dao/hibernate/UserVascoDAOHibernate.java | ||
---|---|---|
45 | 45 |
/** |
46 | 46 |
* @see my.com.upass.dao.UserVascoDAO#insertTokenToStore(my.com.upass.TokenBean) |
47 | 47 |
*/ |
48 |
@Override |
|
49 | 48 |
public boolean insertTokenToStore (UserTokenBean userTokenBean) |
50 | 49 |
{ |
51 | 50 |
Session session = null; |
... | ... | |
83 | 82 |
/** |
84 | 83 |
* @see my.com.upass.dao.UserVascoDAO#updateTokenToStore(my.com.upass.TokenBean) |
85 | 84 |
*/ |
86 |
@Override |
|
87 | 85 |
public boolean updateTokenToStore (UserTokenBean userTokenBean) |
88 | 86 |
{ |
89 | 87 |
Session session = null; |
... | ... | |
118 | 116 |
/** |
119 | 117 |
* @see my.com.upass.dao.UserVascoDAO#getTokenFromStoreBySerialNumber(java.lang.String) |
120 | 118 |
*/ |
121 |
@Override |
|
122 | 119 |
public UserTokenBean getTokenFromStoreBySerialNumber (String serialNumber) |
123 | 120 |
{ |
124 | 121 |
UserTokenBean userTokenBean = null; |
... | ... | |
147 | 144 |
/** |
148 | 145 |
* @see my.com.upass.dao.UserVascoDAO#getTokenFromStoreByUserAlias(java.lang.String) |
149 | 146 |
*/ |
150 |
@Override |
|
151 | 147 |
public UserTokenBean getTokenFromStoreByUserAlias (String userAlias) |
152 | 148 |
{ |
153 | 149 |
UserTokenBean userTokenBean = null; |
... | ... | |
180 | 176 |
/** |
181 | 177 |
* @see my.com.upass.dao.UserVascoDAO#deleteTokenFromStoreBySerialNumber(java.lang.String) |
182 | 178 |
*/ |
183 |
@Override |
|
184 | 179 |
public boolean deleteTokenFromStoreBySerialNumber (String serialNumber) |
185 | 180 |
{ |
186 | 181 |
Session session = null; |
... | ... | |
214 | 209 |
return isDeleted; |
215 | 210 |
} |
216 | 211 |
|
217 |
@Override |
|
218 | 212 |
public int getTokenListSizeFromStoreByCriteria(String batchNumber, |
219 | 213 |
String serialNumber) throws Exception { |
220 | 214 |
|
... | ... | |
253 | 247 |
} |
254 | 248 |
|
255 | 249 |
@SuppressWarnings("unchecked") |
256 |
@Override |
|
257 | 250 |
public List<UserTokenBean> getTokenListFromStoreByCriteria(String batchNumber, |
258 | 251 |
String serialNumber, int startIndex, int rowPerPage) throws Exception { |
259 | 252 |
|
src/my/com/upass/db/DBOperations.java | ||
---|---|---|
3 | 3 |
import java.math.BigDecimal; |
4 | 4 |
import java.sql.CallableStatement; |
5 | 5 |
import java.sql.Connection; |
6 |
import java.sql.DriverManager; |
|
7 | 6 |
import java.sql.PreparedStatement; |
8 | 7 |
import java.sql.ResultSet; |
9 | 8 |
import java.sql.SQLException; |
10 | 9 |
import java.sql.Statement; |
11 | 10 |
import java.util.Date; |
12 |
import java.util.Properties; |
|
13 | 11 |
|
14 |
import javax.naming.InitialContext; |
|
15 |
import javax.sql.DataSource; |
|
16 |
|
|
17 |
import my.com.upass.Config; |
|
18 | 12 |
import my.com.upass.Constants; |
13 |
import my.com.upass.TokenBean; |
|
19 | 14 |
import my.com.upass.pojo.TacBean; |
20 |
import my.com.upass.TokenBean; |
|
21 | 15 |
import my.com.upass.pojo.UserBean; |
22 | 16 |
import net.penril.generic.hibernate.HibernateUtils; |
23 | 17 |
|
src/my/com/upass/gemalto/GemaltoTokenControllerImpl.java | ||
---|---|---|
121 | 121 |
* this will override the existing tokenBean |
122 | 122 |
* |
123 | 123 |
*/ |
124 |
@Override |
|
125 | 124 |
public void setObject(TokenBean tokenBean) |
126 | 125 |
{ |
127 | 126 |
this.tb = tokenBean; |
... | ... | |
131 | 130 |
* this will return the updated object (tokenBean) |
132 | 131 |
* |
133 | 132 |
*/ |
134 |
@Override |
|
135 | 133 |
public TokenBean getUpdatedObject() |
136 | 134 |
{ |
137 | 135 |
return tb; |
... | ... | |
316 | 314 |
* it also acts as last returned error code. |
317 | 315 |
* |
318 | 316 |
*/ |
319 |
@Override |
|
320 | 317 |
public int getRetCode() |
321 | 318 |
{ |
322 | 319 |
return retCode; |
... | ... | |
326 | 323 |
* this will return the updated error text based on the error code |
327 | 324 |
* |
328 | 325 |
*/ |
329 |
@Override |
|
330 | 326 |
public String getLastError() |
331 | 327 |
{ |
332 | 328 |
String code = null; |
... | ... | |
363 | 359 |
* Verify the entered On Time Password (OTP/password) for the given token |
364 | 360 |
* |
365 | 361 |
*/ |
366 |
@Override |
|
367 | 362 |
public int verifyToken(String otp, String userAlias, String pin) throws Exception |
368 | 363 |
{ |
369 | 364 |
return verifyToken(otp); |
... | ... | |
584 | 579 |
* The blob will be regenerated with the backup blob which is initially generated when it is imported from the pskc file. |
585 | 580 |
* |
586 | 581 |
*/ |
587 |
@Override |
|
588 | 582 |
public int resetToken() |
589 | 583 |
{ |
590 | 584 |
this.retCode = 0; |
... | ... | |
600 | 594 |
return Constants.ERR_SUCCESS; |
601 | 595 |
} |
602 | 596 |
|
603 |
@Override |
|
604 | 597 |
public HashMap<String, String> getTokenBlobInfo() |
605 | 598 |
{ |
606 | 599 |
HashMap<String,String> map = new HashMap<String,String>(); |
... | ... | |
669 | 662 |
} |
670 | 663 |
} |
671 | 664 |
|
672 |
@Override |
|
673 | 665 |
public int syncToken(String userAlias, String otp1, String otp2) { |
674 | 666 |
// TODO Auto-generated method stub |
675 | 667 |
return 0; |
src/my/com/upass/pojo/TbAmTacBackup.java | ||
---|---|---|
3 | 3 |
import java.io.Serializable; |
4 | 4 |
import java.sql.Date; |
5 | 5 |
|
6 |
import net.penril.generic.hibernate.GenericDAOHibernate; |
|
7 |
|
|
8 |
import org.hibernate.Criteria; |
|
9 |
import org.hibernate.HibernateException; |
|
10 |
import org.hibernate.criterion.Restrictions; |
|
11 |
|
|
12 | 6 |
/** |
13 | 7 |
* |
14 | 8 |
* PROGRAMMER: Gabbytian Rayvandy |
... | ... | |
38 | 32 |
private Integer terrorCount; |
39 | 33 |
private String tsessionId; |
40 | 34 |
|
41 |
private Integer convertToInteger(String str) |
|
42 |
{ |
|
43 |
return str==""||str==null||str.trim().isEmpty()?null:Integer.parseInt(str); |
|
44 |
} |
|
45 |
|
|
46 | 35 |
/** |
47 | 36 |
* @return the oid |
48 | 37 |
*/ |
src/my/com/upass/secure/metric/SecureMetricTokenControllerImpl.java | ||
---|---|---|
56 | 56 |
/* (non-Javadoc) |
57 | 57 |
* @see my.com.upass.vasco.TokenController#setObject(my.com.upass.TokenBean) |
58 | 58 |
*/ |
59 |
@Override |
|
60 | 59 |
public void setObject(TokenBean tokenBean) { |
61 | 60 |
this.tb = tokenBean; |
62 | 61 |
|
... | ... | |
65 | 64 |
/* (non-Javadoc) |
66 | 65 |
* @see my.com.upass.vasco.TokenController#getUpdatedObject() |
67 | 66 |
*/ |
68 |
@Override |
|
69 | 67 |
public TokenBean getUpdatedObject() { |
70 | 68 |
return tb; |
71 | 69 |
} |
... | ... | |
73 | 71 |
/* (non-Javadoc) |
74 | 72 |
* @see my.com.upass.vasco.TokenController#getRetCode() |
75 | 73 |
*/ |
76 |
@Override |
|
77 | 74 |
public int getRetCode() { |
78 | 75 |
return retCode; |
79 | 76 |
} |
... | ... | |
81 | 78 |
/* (non-Javadoc) |
82 | 79 |
* @see my.com.upass.vasco.TokenController#getLastError() |
83 | 80 |
*/ |
84 |
@Override |
|
85 | 81 |
public String getLastError() { |
86 | 82 |
return Constants.getErrText(String.valueOf(retCode)).get(retCode); |
87 | 83 |
} |
... | ... | |
89 | 85 |
/* (non-Javadoc) |
90 | 86 |
* @see my.com.upass.vasco.TokenController#resetToken() |
91 | 87 |
*/ |
92 |
@Override |
|
93 | 88 |
public int resetToken() { |
94 | 89 |
this.retCode = 0; |
95 | 90 |
|
... | ... | |
99 | 94 |
/* (non-Javadoc) |
100 | 95 |
* @see my.com.upass.vasco.TokenController#getTokenBlobInfo() |
101 | 96 |
*/ |
102 |
@Override |
|
103 | 97 |
public HashMap<String, String> getTokenBlobInfo() { |
104 | 98 |
HashMap<String,String> map = new HashMap<String,String>(); |
105 | 99 |
try { |
... | ... | |
150 | 144 |
* return error code |
151 | 145 |
* 0=success, otherwise fail |
152 | 146 |
*/ |
153 |
@Override |
|
154 | 147 |
public int verifyToken(String otp, String userAlias, String pin) throws Exception { |
155 | 148 |
int rc = Constants.ERR_SUCCESS; |
156 | 149 |
|
... | ... | |
633 | 626 |
return rc; |
634 | 627 |
} |
635 | 628 |
|
636 |
@Override |
|
637 | 629 |
public int syncToken(String userAlias, String otp1, String otp2) { |
638 | 630 |
|
639 | 631 |
int rc = Constants.ERR_SUCCESS; |
src/my/com/upass/spassword/PasswordController.java | ||
---|---|---|
14 | 14 |
import java.util.regex.Matcher; |
15 | 15 |
import java.util.regex.Pattern; |
16 | 16 |
|
17 |
import org.apache.commons.lang.StringUtils; |
|
17 | 18 |
import org.apache.log4j.Logger; |
19 |
|
|
18 | 20 |
import my.com.upass.Config; |
19 | 21 |
import my.com.upass.ConfigBean; |
20 | 22 |
import my.com.upass.Constants; |
... | ... | |
293 | 295 |
public boolean ValidatePasswordPattern (String password) |
294 | 296 |
{ |
295 | 297 |
//if acceptable characters are defined, then check does password contain unacceptable characters |
296 |
if (getConfigBean().getPasswordAcceptPattern()!=null || !getConfigBean().getPasswordAcceptPattern().isEmpty()) {
|
|
298 |
if (StringUtils.isEmpty(getConfigBean().getPasswordAcceptPattern())) {
|
|
297 | 299 |
if (!patternValidator(password, getConfigBean().getPasswordAcceptPattern())) { |
298 | 300 |
return false; |
299 |
}
|
|
301 |
} |
|
300 | 302 |
return true; |
301 | 303 |
} |
302 | 304 |
|
src/my/com/upass/vasco/TokenControllerImpl.java | ||
---|---|---|
34 | 34 |
* |
35 | 35 |
* @see my.com.upass.vasco.TokenController_#setObject(my.com.upass.TokenBean) |
36 | 36 |
*/ |
37 |
@Override |
|
38 | 37 |
public void setObject(TokenBean tokenBean) { |
39 | 38 |
this.tb = tokenBean; |
40 | 39 |
} |
... | ... | |
46 | 45 |
* |
47 | 46 |
* @see my.com.upass.vasco.TokenController_#getUpdatedObject() |
48 | 47 |
*/ |
49 |
@Override |
|
50 | 48 |
public TokenBean getUpdatedObject() { |
51 | 49 |
return tb; |
52 | 50 |
} |
... | ... | |
66 | 64 |
* |
67 | 65 |
* @see my.com.upass.vasco.TokenController_#getRetCode() |
68 | 66 |
*/ |
69 |
@Override |
|
70 |
public int getRetCode() { |
|
67 |
public int getRetCode() { |
|
71 | 68 |
return wrapper.getRetCode(); |
72 | 69 |
} |
73 | 70 |
|
... | ... | |
78 | 75 |
* |
79 | 76 |
* @see my.com.upass.vasco.TokenController_#getLastError() |
80 | 77 |
*/ |
81 |
@Override |
|
82 |
public String getLastError() { |
|
78 |
public String getLastError() { |
|
83 | 79 |
return wrapper.getLastError(); |
84 | 80 |
} |
85 | 81 |
|
... | ... | |
142 | 138 |
} |
143 | 139 |
|
144 | 140 |
|
145 |
@Override |
|
146 | 141 |
public int verifyToken(String otp, String userAlias, String pin) throws Exception |
147 | 142 |
{ |
148 | 143 |
return verifyToken(otp); |
... | ... | |
195 | 190 |
* |
196 | 191 |
* @see my.com.upass.vasco.TokenController_#resetToken() |
197 | 192 |
*/ |
198 |
@Override |
|
199 | 193 |
public int resetToken() { |
200 | 194 |
int rc = wrapper.AAL2ResetTokenInfo(this.blob, this.parms); |
201 | 195 |
updateTokenObject(); |
... | ... | |
215 | 209 |
} |
216 | 210 |
} |
217 | 211 |
|
218 |
@Override |
|
219 | 212 |
public int syncToken(String userAlias, String otp1, String otp2) { |
220 | 213 |
// TODO Auto-generated method stub |
221 | 214 |
return 0; |
src/my/com/upass/vasco/TokenControllerMockup.java | ||
---|---|---|
69 | 69 |
} |
70 | 70 |
} |
71 | 71 |
|
72 |
@Override |
|
73 | 72 |
public void setObject(TokenBean tokenBean) { |
74 | 73 |
this.tokenBean = tokenBean; |
75 | 74 |
} |
76 | 75 |
|
77 |
@Override |
|
78 | 76 |
public TokenBean getUpdatedObject() { |
79 | 77 |
return tokenBean; |
80 | 78 |
} |
81 | 79 |
|
82 |
@Override |
|
83 | 80 |
public int getRetCode() { |
84 | 81 |
return lastRetCode; |
85 | 82 |
} |
86 | 83 |
|
87 |
@Override |
|
88 | 84 |
public String getLastError() { |
89 | 85 |
return "TOKEN_MOCKUP_ENABLED"; |
90 | 86 |
} |
91 | 87 |
|
92 |
@Override |
|
93 | 88 |
public HashMap<String, String> getTokenBlobInfo() { |
94 | 89 |
HashMap<String, String> map = new HashMap<String, String>(); |
95 | 90 |
|
... | ... | |
108 | 103 |
return map; |
109 | 104 |
} |
110 | 105 |
|
111 |
@Override |
|
112 | 106 |
public int verifyToken(String otp, String userAlias, String pin) throws Exception |
113 | 107 |
{ |
114 | 108 |
return verifyToken(otp); |
... | ... | |
119 | 113 |
return lastRetCode; |
120 | 114 |
} |
121 | 115 |
|
122 |
@Override |
|
123 | 116 |
public synchronized int resetToken() { |
124 | 117 |
lastRetCode = tacController.ResetTAC(); |
125 | 118 |
return lastRetCode; |
126 | 119 |
} |
127 | 120 |
|
128 |
@Override |
|
129 | 121 |
public int syncToken(String userAlias, String otp1, String otp2) { |
130 | 122 |
// TODO Auto-generated method stub |
131 | 123 |
return 0; |
Also available in: Unified diff