standard maven war structure
This commit is contained in:
parent
ce870321d5
commit
fc0d920770
1
pom.xml
1
pom.xml
@ -22,7 +22,6 @@
|
||||
|
||||
<build>
|
||||
<finalName>mavor</finalName>
|
||||
<sourceDirectory>src/main</sourceDirectory>
|
||||
<pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
|
||||
<plugins>
|
||||
<plugin>
|
||||
|
26
src/main/java/de/devloop/mavor/AuthenticatedServlet.java
Normal file
26
src/main/java/de/devloop/mavor/AuthenticatedServlet.java
Normal file
@ -0,0 +1,26 @@
|
||||
package de.devloop.mavor;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.http.HttpServlet;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
|
||||
public class AuthenticatedServlet extends HttpServlet {
|
||||
protected Session session;
|
||||
|
||||
@Override
|
||||
protected final void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
|
||||
session = new Session(req.getSession(true));
|
||||
if (!session.isAuthenticated()) {
|
||||
resp.sendRedirect("/mavor/authenticate");
|
||||
} else {
|
||||
doAuthenticatedGet(req, resp);
|
||||
}
|
||||
}
|
||||
|
||||
protected void doAuthenticatedGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
|
||||
// nooooothing
|
||||
}
|
||||
}
|
57
src/main/java/de/devloop/mavor/Session.java
Normal file
57
src/main/java/de/devloop/mavor/Session.java
Normal file
@ -0,0 +1,57 @@
|
||||
package de.devloop.mavor;
|
||||
|
||||
import jakarta.servlet.http.HttpSession;
|
||||
|
||||
public class Session {
|
||||
private HttpSession session;
|
||||
|
||||
private static final String ATTRIBUTE_USERNAME = "username";
|
||||
private static final String ATTRIBUTE_OAUTH_STATE = "oauth.state";
|
||||
private static final String ATTRIBUTE_OAUTH_TOKEN = "oauth.token";
|
||||
|
||||
public Session(HttpSession session) {
|
||||
this.session = session;
|
||||
}
|
||||
|
||||
private String getSafeString(String parameter) {
|
||||
Object value = session.getAttribute(parameter);
|
||||
|
||||
if (value != null) {
|
||||
return value.toString();
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public Boolean isAuthenticated() {
|
||||
return getUsername() != null;
|
||||
}
|
||||
|
||||
public String getUsername() {
|
||||
return getSafeString(ATTRIBUTE_USERNAME);
|
||||
}
|
||||
|
||||
public void setUsername(String username) {
|
||||
session.setAttribute(ATTRIBUTE_USERNAME, username);
|
||||
}
|
||||
|
||||
public void setOAuthState(String state) {
|
||||
session.setAttribute(ATTRIBUTE_OAUTH_STATE, state);
|
||||
}
|
||||
|
||||
public String getOAuthState() {
|
||||
return getSafeString(ATTRIBUTE_OAUTH_STATE);
|
||||
}
|
||||
|
||||
public void clearOAuthState() {
|
||||
session.removeAttribute(ATTRIBUTE_OAUTH_STATE);
|
||||
}
|
||||
|
||||
public void setOAuthToken(String token) {
|
||||
session.setAttribute(ATTRIBUTE_OAUTH_TOKEN, token);
|
||||
}
|
||||
|
||||
public String getOAuthToken() {
|
||||
return getSafeString(ATTRIBUTE_OAUTH_TOKEN);
|
||||
}
|
||||
}
|
@ -19,22 +19,26 @@ public class Download extends AuthenticatedServlet {
|
||||
private static final String PARAMETER_ARTEFACT_ID = "artefactId";
|
||||
private static final String PARAMETER_VERSION = "version";
|
||||
|
||||
private static final String TEMP_DIR = "/home/damage/Temp/mavor";
|
||||
|
||||
@Override
|
||||
protected void doAuthenticatedGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
|
||||
String site = req.getParameter(PARAMETER_SITE);
|
||||
String groupId = req.getParameter(PARAMETER_GROUP_ID);
|
||||
String artifactId = req.getParameter(PARAMETER_ARTEFACT_ID);
|
||||
String version = req.getParameter(PARAMETER_VERSION);
|
||||
|
||||
String artifact = String.format("%s:%s:%s", groupId, artifactId, version);
|
||||
|
||||
PrintStream out = new PrintStream(resp.getOutputStream());
|
||||
|
||||
MavenCli cli = new MavenCli();
|
||||
System.setProperty("maven.multiModuleProjectDirectory", "/home/damage/Temp");
|
||||
cli.doMain(new String[]{"dependency:copy", "-Dartifact=com.google.code.gson:gson:2.11.0", "-DoutputDirectory=/home/damage/Temp"}, "/home/damage/Temp", out, out);
|
||||
// TODO: does not work -> generate pom.xml in temp dir and use dependency:copy-dependencies?
|
||||
System.setProperty("maven.repo.remote", site);
|
||||
cli.doMain(new String[]{"dependency:copy", "-Dartifact=" + artifact, "-DoutputDirectory=/home/damage/Temp"}, "/home/damage/Temp", out, out);
|
||||
|
||||
//RequestDispatcher view = req.getRequestDispatcher("/download.jsp");
|
||||
|
||||
|
||||
//view.forward(req, resp);
|
||||
|
||||
}
|
||||
}
|
22
src/main/java/de/devloop/mavor/servlet/Main.java
Normal file
22
src/main/java/de/devloop/mavor/servlet/Main.java
Normal file
@ -0,0 +1,22 @@
|
||||
package de.devloop.mavor.servlet;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import de.devloop.mavor.AuthenticatedServlet;
|
||||
import jakarta.servlet.RequestDispatcher;
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.annotation.WebServlet;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
|
||||
@WebServlet("")
|
||||
public class Main extends AuthenticatedServlet {
|
||||
|
||||
@Override
|
||||
protected void doAuthenticatedGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
|
||||
req.setAttribute("username", session.getUsername());
|
||||
RequestDispatcher view = req.getRequestDispatcher("/main.jsp");
|
||||
|
||||
view.forward(req, resp);
|
||||
}
|
||||
}
|
19
src/main/java/de/devloop/openid/AuthenticationUrl.java
Normal file
19
src/main/java/de/devloop/openid/AuthenticationUrl.java
Normal file
@ -0,0 +1,19 @@
|
||||
package de.devloop.openid;
|
||||
|
||||
public class AuthenticationUrl {
|
||||
private String url;
|
||||
private String state;
|
||||
|
||||
public AuthenticationUrl(String url, String state) {
|
||||
this.url = url;
|
||||
this.state = state;
|
||||
}
|
||||
|
||||
public String getUrl() {
|
||||
return url;
|
||||
}
|
||||
|
||||
public String getState() {
|
||||
return state;
|
||||
}
|
||||
}
|
102
src/main/java/de/devloop/openid/OpenID.java
Normal file
102
src/main/java/de/devloop/openid/OpenID.java
Normal file
@ -0,0 +1,102 @@
|
||||
package de.devloop.openid;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.net.URLEncoder;
|
||||
import java.net.http.HttpClient;
|
||||
import java.net.http.HttpRequest;
|
||||
import java.net.http.HttpRequest.BodyPublishers;
|
||||
import java.net.http.HttpResponse;
|
||||
import java.net.http.HttpResponse.BodyHandlers;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
|
||||
public class OpenID {
|
||||
private static final String CLIENT_ID = "vP9xF2s1yy2n6sR05jV6dguyMeOvIxCg1GarV71O";
|
||||
private static final String CLIENT_SECRET = "PrwGSMcucxYPkOdrb23jddWqyn31vphrxCUu9MGdLTCUnbk0OJI5oWCvO0khVhcnJNDbJaKWxNMxaC4bJ92jy8bDjtG6oaWG37qhuLRPMh5DKluZxsCMmCvQ8f9ZQckZ";
|
||||
|
||||
private static final String REDIRECT_URL = "http://localhost:8080/mavor/authenticate";
|
||||
|
||||
private static final String OAUTH_AUTH_URL = "https://auth.devloop.de/application/o/authorize/";
|
||||
private static final String OAUTH_TOKEN_URL = "https://auth.devloop.de/application/o/token/";
|
||||
private static final String OAUTH_USERINFO_URL = "https://auth.devloop.de/application/o/userinfo/";
|
||||
|
||||
public AuthenticationUrl getAuthenticationUrl() {
|
||||
String state = UUID.randomUUID().toString();
|
||||
String url = String.format("%s?response_type=code&client_id=%s&redirect_uri=%s&state=%s&scope=openid email", OAUTH_AUTH_URL, CLIENT_ID, REDIRECT_URL, state);
|
||||
return new AuthenticationUrl(url, state);
|
||||
}
|
||||
|
||||
private URI getUriObject(String url) throws OpenIdRequestException {
|
||||
try {
|
||||
return new URI(url);
|
||||
} catch (URISyntaxException e) {
|
||||
throw new OpenIdRequestException(String.format("Invalid URL: '%s'", url), e);
|
||||
}
|
||||
}
|
||||
|
||||
public Token requestToken(String code) throws OpenIdRequestException {
|
||||
URI tokenUrl = getUriObject(OAUTH_TOKEN_URL);
|
||||
HashMap<String, String> tokenParameter = new HashMap<>();
|
||||
tokenParameter.put("grant_type", "authorization_code");
|
||||
tokenParameter.put("client_id", CLIENT_ID);
|
||||
tokenParameter.put("client_secret", CLIENT_SECRET);
|
||||
tokenParameter.put("code", code);
|
||||
tokenParameter.put("redirect_uri", REDIRECT_URL);
|
||||
|
||||
HttpRequest tokenRequest = HttpRequest.newBuilder()
|
||||
.uri(tokenUrl)
|
||||
.header("Content-Type", "application/x-www-form-urlencoded")
|
||||
.header("Accept", "application/json")
|
||||
.POST(BodyPublishers.ofString(getFormDataAsString(tokenParameter)))
|
||||
.build();
|
||||
HttpClient tokenClient = HttpClient.newHttpClient();
|
||||
HttpResponse<String> tokenResponse;
|
||||
try {
|
||||
tokenResponse = tokenClient.send(tokenRequest, BodyHandlers.ofString());
|
||||
} catch (IOException | InterruptedException e) {
|
||||
throw new OpenIdRequestException("Requesting access token failed", e);
|
||||
}
|
||||
|
||||
Gson gson = new Gson();
|
||||
return gson.fromJson(tokenResponse.body(), Token.class);
|
||||
}
|
||||
|
||||
public UserInfo requestUserInfo(Token token) throws OpenIdRequestException {
|
||||
URI userInfoUrl = getUriObject(OAUTH_USERINFO_URL);
|
||||
HttpRequest userInfoRequest = HttpRequest.newBuilder()
|
||||
.uri(userInfoUrl)
|
||||
.header("Accept", "application/json")
|
||||
.header("Authorization", "Bearer " + token.getAccessToken())
|
||||
.GET()
|
||||
.build();
|
||||
HttpClient userInfoClient = HttpClient.newHttpClient();
|
||||
HttpResponse<String> userInfoResponse;
|
||||
try {
|
||||
userInfoResponse = userInfoClient.send(userInfoRequest, BodyHandlers.ofString());
|
||||
} catch (IOException | InterruptedException e) {
|
||||
throw new OpenIdRequestException("Requesting user info failed", e);
|
||||
}
|
||||
|
||||
Gson gson = new Gson();
|
||||
return gson.fromJson(userInfoResponse.body(), UserInfo.class);
|
||||
}
|
||||
|
||||
private String getFormDataAsString(Map<String, String> formData) {
|
||||
StringBuilder formBodyBuilder = new StringBuilder();
|
||||
for (Map.Entry<String, String> singleEntry : formData.entrySet()) {
|
||||
if (formBodyBuilder.length() > 0) {
|
||||
formBodyBuilder.append("&");
|
||||
}
|
||||
formBodyBuilder.append(URLEncoder.encode(singleEntry.getKey(), StandardCharsets.UTF_8));
|
||||
formBodyBuilder.append("=");
|
||||
formBodyBuilder.append(URLEncoder.encode(singleEntry.getValue(), StandardCharsets.UTF_8));
|
||||
}
|
||||
return formBodyBuilder.toString();
|
||||
}
|
||||
}
|
@ -0,0 +1,7 @@
|
||||
package de.devloop.openid;
|
||||
|
||||
public class OpenIdRequestException extends Exception {
|
||||
public OpenIdRequestException(String message, Throwable cause) {
|
||||
super(message, cause);
|
||||
}
|
||||
}
|
18
src/main/java/de/devloop/openid/Token.java
Normal file
18
src/main/java/de/devloop/openid/Token.java
Normal file
@ -0,0 +1,18 @@
|
||||
package de.devloop.openid;
|
||||
|
||||
import com.google.gson.annotations.SerializedName;
|
||||
|
||||
public class Token {
|
||||
|
||||
@SerializedName("access_token")
|
||||
private String accessToken;
|
||||
|
||||
public String getAccessToken() {
|
||||
return accessToken;
|
||||
}
|
||||
|
||||
public void setAccessToken(String accessToken) {
|
||||
this.accessToken = accessToken;
|
||||
}
|
||||
|
||||
}
|
15
src/main/java/de/devloop/openid/UserInfo.java
Normal file
15
src/main/java/de/devloop/openid/UserInfo.java
Normal file
@ -0,0 +1,15 @@
|
||||
package de.devloop.openid;
|
||||
|
||||
public class UserInfo {
|
||||
|
||||
private String email;
|
||||
|
||||
public String getEmail() {
|
||||
return email;
|
||||
}
|
||||
|
||||
public void setEmail(String email) {
|
||||
this.email = email;
|
||||
}
|
||||
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user