Commit 2838287e authored by 0Tyler's avatar 0Tyler

add log for userProxyService

parent d4258765
Pipeline #1673 canceled with stages
package com.google.webauthn.gaedemo.service;
public class UserProxyService {
private static UserProxyService instance;
private String username;
public UserProxyService() {}
public static UserProxyService getInstance(){
if(instance == null){
synchronized(UserProxyService.class){
if(instance == null){
instance = new UserProxyService();
}
}
}
return instance;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
}
...@@ -20,6 +20,7 @@ import java.util.ArrayList; ...@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.logging.Logger;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
...@@ -42,12 +43,13 @@ import com.google.webauthn.gaedemo.objects.PublicKeyCredentialCreationOptions; ...@@ -42,12 +43,13 @@ import com.google.webauthn.gaedemo.objects.PublicKeyCredentialCreationOptions;
import com.google.webauthn.gaedemo.objects.PublicKeyCredentialDescriptor; import com.google.webauthn.gaedemo.objects.PublicKeyCredentialDescriptor;
import com.google.webauthn.gaedemo.objects.PublicKeyCredentialType; import com.google.webauthn.gaedemo.objects.PublicKeyCredentialType;
import com.google.webauthn.gaedemo.objects.UserVerificationRequirement; import com.google.webauthn.gaedemo.objects.UserVerificationRequirement;
import com.google.webauthn.gaedemo.service.UserProxyService;
import com.google.webauthn.gaedemo.storage.CableKeyPair; import com.google.webauthn.gaedemo.storage.CableKeyPair;
import com.google.webauthn.gaedemo.storage.Credential; import com.google.webauthn.gaedemo.storage.Credential;
import com.google.webauthn.gaedemo.storage.SessionData; import com.google.webauthn.gaedemo.storage.SessionData;
public class BeginMakeCredential extends HttpServlet { public class BeginMakeCredential extends HttpServlet {
private static final Logger log = Logger.getLogger(BeginMakeCredential.class.getName());
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final UserService userService = UserServiceFactory.getUserService(); private final UserService userService = UserServiceFactory.getUserService();
...@@ -63,7 +65,7 @@ public class BeginMakeCredential extends HttpServlet { ...@@ -63,7 +65,7 @@ public class BeginMakeCredential extends HttpServlet {
protected void doPost(HttpServletRequest request, HttpServletResponse response) protected void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException { throws ServletException, IOException {
// Tyler ----------------- // Tyler -----------------
// String username = request.getParameter("username"); String username = request.getParameter("username");
// User user = new User(username, "localhost"); // User user = new User(username, "localhost");
// // String rpId = (request.isSecure() ? "https://" : "http://") + request.getHeader("Host"); // // String rpId = (request.isSecure() ? "https://" : "http://") + request.getHeader("Host");
// String rpId = Iterables.get(Splitter.on(':').split(request.getHeader("Host")), 0); // String rpId = Iterables.get(Splitter.on(':').split(request.getHeader("Host")), 0);
...@@ -97,6 +99,9 @@ public class BeginMakeCredential extends HttpServlet { ...@@ -97,6 +99,9 @@ public class BeginMakeCredential extends HttpServlet {
// //
// response.setContentType("application/json"); // response.setContentType("application/json");
// response.getWriter().println(optionsJson.toString()); // response.getWriter().println(optionsJson.toString());
UserProxyService.getInstance().setUsername(username);
String username2 = UserProxyService.getInstance().getUsername();
log.info("make" + username2);
// Tyler ----------------- // Tyler -----------------
// Original Code // Original Code
......
...@@ -16,6 +16,7 @@ package com.google.webauthn.gaedemo.servlets; ...@@ -16,6 +16,7 @@ package com.google.webauthn.gaedemo.servlets;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.logging.Logger;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
...@@ -31,12 +32,14 @@ import com.google.gson.JsonObject; ...@@ -31,12 +32,14 @@ import com.google.gson.JsonObject;
import com.google.webauthn.gaedemo.objects.AttestationObject; import com.google.webauthn.gaedemo.objects.AttestationObject;
import com.google.webauthn.gaedemo.objects.AuthenticatorAttestationResponse; import com.google.webauthn.gaedemo.objects.AuthenticatorAttestationResponse;
import com.google.webauthn.gaedemo.objects.CredentialPublicKey; import com.google.webauthn.gaedemo.objects.CredentialPublicKey;
import com.google.webauthn.gaedemo.service.UserProxyService;
import com.google.webauthn.gaedemo.storage.Credential; import com.google.webauthn.gaedemo.storage.Credential;
/** /**
* Servlet implementation class RegisteredKeys * Servlet implementation class RegisteredKeys
*/ */
public class RegisteredKeys extends HttpServlet { public class RegisteredKeys extends HttpServlet {
private static final Logger log = Logger.getLogger(RegisteredKeys.class.getName());
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final UserService userService = UserServiceFactory.getUserService(); private final UserService userService = UserServiceFactory.getUserService();
...@@ -51,6 +54,9 @@ public class RegisteredKeys extends HttpServlet { ...@@ -51,6 +54,9 @@ public class RegisteredKeys extends HttpServlet {
@Override @Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException { throws ServletException, IOException {
String username = UserProxyService.getInstance().getUsername();
log.info("Get " + username);
// Tyler--------------------
String currentUser = userService.getCurrentUser().getEmail(); String currentUser = userService.getCurrentUser().getEmail();
List<Credential> savedCreds = Credential.load(currentUser); List<Credential> savedCreds = Credential.load(currentUser);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment