working on string-templated based static pages
This commit is contained in:
@@ -1,43 +0,0 @@
|
||||
package de.srsoftware.widerhall.web;
|
||||
|
||||
import de.srsoftware.tools.Tag;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.IOException;
|
||||
|
||||
public class Index extends HttpServlet {
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(Index.class);
|
||||
|
||||
@Override
|
||||
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
|
||||
resp.setContentType("text/html");
|
||||
resp.setStatus(HttpServletResponse.SC_OK);
|
||||
String auth = req.getHeader("Authorization");
|
||||
if (auth == null) {
|
||||
resp.sendRedirect("login");
|
||||
return;
|
||||
}
|
||||
LOG.debug("Authorization: {}",auth);
|
||||
|
||||
resp.getWriter().println(page(auth));
|
||||
|
||||
}
|
||||
|
||||
private Tag head() {
|
||||
return new Tag("meta")
|
||||
.attr("charset","utf-8")
|
||||
.addTo(new Tag("head"));
|
||||
|
||||
}
|
||||
|
||||
private Tag page(String auth) {
|
||||
var body = new Tag("body").content(auth);
|
||||
return body.addTo(head().addTo(new Tag("html")));
|
||||
}
|
||||
}
|
||||
@@ -1,127 +0,0 @@
|
||||
package de.srsoftware.widerhall.web;
|
||||
|
||||
import de.srsoftware.widerhall.Configuration;
|
||||
import de.srsoftware.widerhall.web.tags.Page;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import javax.net.ssl.HttpsURLConnection;
|
||||
import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.BufferedReader;
|
||||
import java.io.DataOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.URLEncoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class Login extends HttpServlet {
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(Login.class);
|
||||
private final Configuration config;
|
||||
|
||||
public Login(){
|
||||
this.config = Configuration.instance();
|
||||
LOG.debug("Creating new instance of Login.class");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
|
||||
var error = req.getParameter("error");
|
||||
if (error != null){
|
||||
var description = req.getParameter("error_description");
|
||||
sendError(resp,error+": "+description);
|
||||
return;
|
||||
}
|
||||
LOG.debug("params: {}",req.getParameterMap());
|
||||
var code = req.getParameter("code");
|
||||
if (code != null){
|
||||
getTokenFor(code,resp);
|
||||
resp.getWriter().println(new Page("rceived code: "+code));
|
||||
return;
|
||||
}
|
||||
resp.sendRedirect(loginUrl());
|
||||
}
|
||||
|
||||
private static String urlEncode(Map<String, Object> data) {
|
||||
String params = data.entrySet()
|
||||
.stream()
|
||||
.map(entry -> encode(entry.getKey()) + "=" + encode(entry.getValue()))
|
||||
.collect(Collectors.joining("&"));
|
||||
return params;
|
||||
}
|
||||
|
||||
private static String encode(Object value) {
|
||||
return URLEncoder.encode(value.toString(),StandardCharsets.UTF_8);
|
||||
}
|
||||
|
||||
private void getTokenFor(String code, HttpServletResponse resp) throws IOException {
|
||||
var url = config.tokenUrl();
|
||||
LOG.debug("Sending 'POST' request to URL '{}'",url);
|
||||
HttpsURLConnection httpClient = (HttpsURLConnection) url.openConnection();
|
||||
|
||||
//add reuqest header
|
||||
httpClient.setRequestMethod("POST");
|
||||
httpClient.setRequestProperty( "Content-Type", "application/x-www-form-urlencoded");
|
||||
httpClient.setRequestProperty( "Accept", "*/*" );
|
||||
//httpClient.setRequestProperty("User-Agent", "Mozilla/5.0");
|
||||
//httpClient.setRequestProperty("Accept-Language", "en-US,en;q=0.5");
|
||||
|
||||
String urlParameters = urlEncode(Map.of(
|
||||
"code",code,
|
||||
"client_id",config.clientId(),
|
||||
"client_secret",config.clientSecret(),
|
||||
"grant_type","authorization_code"));
|
||||
|
||||
LOG.debug("Posting parameters '{}'",urlParameters);
|
||||
|
||||
// Send post request
|
||||
httpClient.setDoOutput(true);
|
||||
httpClient.setDoInput(true);
|
||||
try (DataOutputStream wr = new DataOutputStream(httpClient.getOutputStream())) {
|
||||
wr.writeBytes(urlParameters);
|
||||
wr.flush();
|
||||
}
|
||||
|
||||
int responseCode = httpClient.getResponseCode();
|
||||
LOG.debug("Response Code: {}",responseCode);
|
||||
|
||||
try (BufferedReader in = new BufferedReader(new InputStreamReader(httpClient.getInputStream()))) {
|
||||
|
||||
String line;
|
||||
StringBuilder response = new StringBuilder();
|
||||
|
||||
while ((line = in.readLine()) != null) {
|
||||
response.append(line);
|
||||
}
|
||||
|
||||
//print result
|
||||
//System.out.println(response.toString());
|
||||
resp.getWriter().println(response);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private void sendError(HttpServletResponse resp, String error) throws IOException {
|
||||
LOG.debug("error: {}",error);
|
||||
resp.sendError(HttpServletResponse.SC_BAD_REQUEST,error);
|
||||
}
|
||||
|
||||
private String loginUrl() {
|
||||
return config.loginUrl()+"?"+urlEncode(Map.of(
|
||||
"response_type","code",
|
||||
"client_id",config.clientId(),
|
||||
"state",123456,
|
||||
"redirect_uri",redirectUri(),
|
||||
"scope","openid"
|
||||
));
|
||||
}
|
||||
|
||||
private String redirectUri() {
|
||||
int port = config.serverPort();
|
||||
return config.baseUrl()+(port == 80 ? "" : ":"+port)+"/login";
|
||||
}
|
||||
}
|
||||
138
src/main/java/de/srsoftware/widerhall/web/Static.java
Normal file
138
src/main/java/de/srsoftware/widerhall/web/Static.java
Normal file
@@ -0,0 +1,138 @@
|
||||
package de.srsoftware.widerhall.web;
|
||||
|
||||
import de.srsoftware.widerhall.Configuration;
|
||||
import de.srsoftware.widerhall.Util;
|
||||
import de.srsoftware.widerhall.data.User;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.stringtemplate.v4.STGroup;
|
||||
import org.stringtemplate.v4.STGroupDir;
|
||||
|
||||
import javax.servlet.ServletException;
|
||||
import javax.servlet.http.HttpServlet;
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.util.Map;
|
||||
|
||||
import static de.srsoftware.widerhall.Util.t;
|
||||
|
||||
public class Static extends HttpServlet {
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(Static.class);
|
||||
private final String baseDir;
|
||||
private final STGroup templates;
|
||||
|
||||
public Static(){
|
||||
var config = Configuration.instance();
|
||||
baseDir = config.baseDir();
|
||||
var templateDir = String.join(File.separator,baseDir,"templates");
|
||||
templates = new STGroupDir(templateDir,'{','}');
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
|
||||
String error = handleGet(req, resp);
|
||||
if (error != null) resp.sendError(400,error);
|
||||
}
|
||||
|
||||
private String handleGet(HttpServletRequest req, HttpServletResponse resp) {
|
||||
var path = req.getPathInfo();
|
||||
path = path == null ? "index" : path.substring(1);
|
||||
switch (path){
|
||||
case "css":
|
||||
return loadFile("style.css",resp);
|
||||
case "js":
|
||||
return loadFile("widerhall.js",resp);
|
||||
case "jquery":
|
||||
return loadFile("jquery-3.6.0.min.js",resp);
|
||||
case "login":
|
||||
return loadTemplate(path, null, resp);
|
||||
}
|
||||
|
||||
var u = req.getSession().getAttribute("user");
|
||||
if (u instanceof User user){
|
||||
Map<String,Object> data = Map.of("user",user.map());
|
||||
return loadTemplate(path,data,resp);
|
||||
}
|
||||
return loginRedirect(resp);
|
||||
}
|
||||
|
||||
private String loadTemplate(String path, Map<String, ? extends Object> data, HttpServletResponse resp) {
|
||||
var template = templates.getInstanceOf(path);
|
||||
if (template != null){
|
||||
try {
|
||||
template.add("data",data);
|
||||
resp.getWriter().println(template.render());
|
||||
return null;
|
||||
} catch (IOException e) {
|
||||
return t("Failed to load template '{}'",path);
|
||||
}
|
||||
}
|
||||
return t("No template for path {}!",path);
|
||||
}
|
||||
|
||||
|
||||
private String loginRedirect(HttpServletResponse resp) {
|
||||
try {
|
||||
resp.sendRedirect("/static/login");
|
||||
return null;
|
||||
} catch (IOException e) {
|
||||
return t("Was not able to redirect to login page: {}", e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private String loadFile(String filename, HttpServletResponse resp) {
|
||||
var path = String.join(File.separator,baseDir,filename);
|
||||
LOG.debug("loading {}",path);
|
||||
var file = new File(path);
|
||||
if (!file.exists()) return t("File {} does not exist!",filename);
|
||||
try {
|
||||
var content = Files.readString(file.toPath());
|
||||
resp.getWriter().println(content);
|
||||
} catch (IOException e) {
|
||||
return t("Failed to load file '{}'!",filename);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
|
||||
String error = handlePost(req, resp);
|
||||
if (error != null) resp.sendError(400,error);
|
||||
}
|
||||
|
||||
private String handlePost(HttpServletRequest req, HttpServletResponse resp) {
|
||||
var path = req.getPathInfo();
|
||||
if (path == null) path = "/";
|
||||
switch (path){
|
||||
case "/login":
|
||||
return handleLogin(req,resp);
|
||||
}
|
||||
|
||||
return t("No handler for path {}!",path);
|
||||
}
|
||||
|
||||
private String handleLogin(HttpServletRequest req, HttpServletResponse resp) {
|
||||
var email = req.getParameter("email");
|
||||
var pass = req.getParameter("pass");
|
||||
if (email == null || pass == null) return loginRedirect(resp);
|
||||
if (!Util.isEmail(email)) return loadTemplate("login", Map.of("error",t("'{}' is not a valid email address!",email)), resp);
|
||||
try {
|
||||
var user = User.load(email,pass);
|
||||
req.getSession().setAttribute("user",user);
|
||||
resp.sendRedirect("/static");
|
||||
} catch (Exception e) {
|
||||
try {
|
||||
LOG.warn("Static.handleLogin failed:",e);
|
||||
Thread.sleep(10000);
|
||||
} finally {
|
||||
return loadTemplate("login", Map.of("error",t("Invalid username/password")), resp);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
package de.srsoftware.widerhall.web.tags;
|
||||
|
||||
import de.srsoftware.tools.Tag;
|
||||
|
||||
public class Header extends Tag {
|
||||
public Header() {
|
||||
super("head");
|
||||
new Tag("meta").attr("charset","utf-8").addTo(this);
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package de.srsoftware.widerhall.web.tags;
|
||||
|
||||
import de.srsoftware.tools.Tag;
|
||||
|
||||
public class Page extends Tag {
|
||||
public Page(String content) {
|
||||
super("html");
|
||||
new Header().addTo(this);
|
||||
new Tag("body").content(content).addTo(this);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user