Using SubjectSerialNumber provider correctly

trifork · Jun 20, 2011 · d3527da · d3527da
1 parent 189791f
commit d3527da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/subprojects/lookup/src/main/java/com/trifork/stamdata/lookup/rest/PersonResource.java b/subprojects/lookup/src/main/java/com/trifork/stamdata/lookup/rest/PersonResource.java
@@ -52,14 +52,15 @@ public PersonResource(PersonDao personDao,
 	@Produces("text/xml")
 	public Response getPerson(@PathParam("cpr") String cpr) {
 		CurrentPersonData person = personDao.get(cpr);
+		String subjectSerialNumber = clientSsn.get().toString();
 		if (person == null) {
-			usageLogger.log(clientSsn.get().toString(), "lookup.cpr.person.notfound", 1);
-			logger.info("Opslag på ikke-eksisterende cpr-nummer. cpr={}, subject-serialnumber='{}'", cpr, clientSsn);
+			usageLogger.log(subjectSerialNumber, "lookup.cpr.person.notfound", 1);
+			logger.info("Opslag på ikke-eksisterende cpr-nummer. cpr={}, subject-serialnumber='{}'", cpr, subjectSerialNumber);
             return buildNotFoundResponse(cpr);
 		}
 		PersonType personPart = personPartConverter.convert(person);
-		usageLogger.log(clientSsn.get().toString(), "lookup.cpr.person.ok", 1);
-		logger.info("Opslag på cpr={}, subject-serialnumber='{}'", cpr, clientSsn);
+		usageLogger.log(subjectSerialNumber, "lookup.cpr.person.ok", 1);
+		logger.info("Opslag på cpr={}, subject-serialnumber='{}'", cpr, subjectSerialNumber);
 		return Response.ok(new oio.sagdok.person._1_0.ObjectFactory().createPerson(personPart)).build();
 	}
 

diff --git a/...n/java/com/trifork/stamdata/replication/gui/security/twowayssl/TwoWaySslUserProvider.java b/...n/java/com/trifork/stamdata/replication/gui/security/twowayssl/TwoWaySslUserProvider.java
@@ -13,16 +13,17 @@
 import com.trifork.stamdata.ssl.AuthenticatedSsnProvider.AuthenticationFailedException.Reason;
 import com.trifork.stamdata.ssl.SubjectSerialNumber;
 import com.trifork.stamdata.ssl.SubjectSerialNumber.Kind;
+import com.trifork.stamdata.ssl.UncheckedProvider;
 import com.trifork.stamdata.ssl.annotations.AuthenticatedSSN;
 
 public class TwoWaySslUserProvider implements Provider<User> {
 	private static final Logger logger = LoggerFactory.getLogger(TwoWaySslUserProvider.class);
-	private final Provider<SubjectSerialNumber> ssnProvider;
+	private final UncheckedProvider<SubjectSerialNumber> ssnProvider;
 	private final Provider<HttpServletRequest> request;
 	private final UserDao userDao;
 
 	@Inject
-	public TwoWaySslUserProvider(@AuthenticatedSSN Provider<SubjectSerialNumber> ssnProvider, UserDao userDao, Provider<HttpServletRequest> request) {
+	public TwoWaySslUserProvider(@AuthenticatedSSN UncheckedProvider<SubjectSerialNumber> ssnProvider, UserDao userDao, Provider<HttpServletRequest> request) {
 		this.ssnProvider = ssnProvider;
 		this.userDao = userDao;
 		this.request = request;