FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Update AdminController.java by jlem0714 · Pull Request #6 · jlem0714/shiftleft-java-demo · GitHub

/ shiftleft-java-demo Public
forked from ShiftLeftSecurity/shiftleft-java-demo

Update AdminController.java #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jlem0714 wants to merge 1 commit into
base: master
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 0 Commits 1 Checks 0 Files changed
Open

Update AdminController.java #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .java  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
46 changes: 27 additions & 19 deletions src/main/java/io/shiftleft/controller/AdminController.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,13 @@
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Base64;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.bind.DatatypeConverter;
import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Controller;
import org.springframework.util.FileCopyUtils;
Expand All @@ -28,23 +31,24 @@ public class AdminController {
private String fail = "redirect:/";

// helper
private boolean isAdmin(String auth)
private boolean isAdmin(String auth, String authHash)
{
try {
if (authHash == null) {
return false;
}
MessageDigest md = MessageDigest.getInstance("SHA1");
md.update(auth.getBytes());
byte[] digest = md.digest();
String calcHash = DatatypeConverter.printHexBinary(digest).toUpperCase();
if (!calcHash.equals(authHash)) {
return false;
}
ByteArrayInputStream bis = new ByteArrayInputStream(Base64.getDecoder().decode(auth));
ObjectInputStream objectInputStream = new ObjectInputStream(bis);
Object authToken = objectInputStream.readObject();
return ((AuthToken) authToken).isAdmin();
} catch (Exception ex) {
System.out.println(" cookie cannot be deserialized: "+ex.getMessage());
return false;
}
}
AuthToken authToken = new AuthToken(objectInputStream.readInt());
return authToken.isAdmin();

//
@RequestMapping(value = "/admin/printSecrets", method = RequestMethod.POST)
public String doPostPrintSecrets(HttpServletResponse response, HttpServletRequest request) {
return fail;
}


Expand All @@ -65,7 +69,9 @@ public String doGetPrintSecrets(@CookieValue(value = "auth", defaultValue = "not
byte[] bdata = FileCopyUtils.copyToByteArray(cpr.getInputStream());
response.getOutputStream().println(new String(bdata, StandardCharsets.UTF_8));
return null;
} catch (IOException ex) {
String authHash = request.getSession().getAttribute("authHash").toString();
if(!isAdmin(authToken, authHash)) {

ex.printStackTrace();
// redirect to /
return fail;
Expand Down Expand Up @@ -96,7 +102,7 @@ public String doPostLogin(@CookieValue(value = "auth", defaultValue = "notset")

// split password=value
String[] pass = password.split("=");
if(pass.length!=2) {
if(isAdmin(auth, null)) {
return fail;
}
// compare pass
Expand All @@ -116,13 +122,15 @@ public String doPostLogin(@CookieValue(value = "auth", defaultValue = "notset")
}
return fail;
}
catch (Exception ex)
{
ex.printStackTrace();
// no succ == fail
MessageDigest md = MessageDigest.getInstance("SHA1");
md.update(cookieValue.getBytes());
byte[] digest = md.digest();
String authHash = DatatypeConverter.printHexBinary(digest).toUpperCase();

return fail;
}
}
// Store the hash of the authToken so that we can check them later
request.getSession().setAttribute("authHash",authHash);

/**
* Same as POST but just a redirect
Expand Down
Back | FazBrowse Home | New Git URL