From b78f31670fdc1602eb99a53d11ff55ffa5d9a643 Mon Sep 17 00:00:00 2001 From: Lukas-Heiligenbrunner Date: Fri, 27 Sep 2019 10:58:13 +0200 Subject: [PATCH] * login process * register page * post query * get query --- src/db/jdcb.java | 28 +++++---- src/main.java | 7 ++- src/website/GetRequest.java | 49 +++++++++++++++ src/website/HttpTools.java | 19 ++++++ src/website/LoginRequest.java | 41 +++++++++++++ src/website/MainPage.java | 57 ++++++++++++++++++ src/website/PostRequest.java | 48 +++++++++++++++ src/website/Webserver.java | 109 ++-------------------------------- wwwroot/css/register.css | 89 +++++++++++++++++++++++++++ wwwroot/index.html | 2 +- wwwroot/js/index.js | 13 +++- wwwroot/js/register.js | 3 + wwwroot/register.html | 88 +++++++++++++++++++++++++++ 13 files changed, 434 insertions(+), 119 deletions(-) create mode 100644 src/website/GetRequest.java create mode 100644 src/website/HttpTools.java create mode 100644 src/website/LoginRequest.java create mode 100644 src/website/MainPage.java create mode 100644 src/website/PostRequest.java create mode 100644 wwwroot/css/register.css create mode 100644 wwwroot/js/register.js create mode 100644 wwwroot/register.html diff --git a/src/db/jdcb.java b/src/db/jdcb.java index 38525c0..c32f6a5 100644 --- a/src/db/jdcb.java +++ b/src/db/jdcb.java @@ -7,27 +7,33 @@ import java.sql.ResultSet; import java.sql.SQLException; public class jdcb { - public void executeQuery(String sql) { + String username; + String password; + String dbName; + + public jdcb(String username, String password, String dbName) { + this.username = username; + this.password=password; + this.dbName = dbName; + } + + public ResultSet executeQuery(String sql) { Database db = new MySQLConnector( - "users", - "kOpaIJUjkgb9ur6S", - "127.0.0.1", + username, + password, + "192.168.65.15", 3306, - "wasteinformation"); + dbName); Connection c = db.getConnection(); try { PreparedStatement stmt = c.prepareStatement(sql); - ResultSet r = stmt.executeQuery(); - - DefaultTableModel model = Database.logToTable(r); - -// this.resultTable.setModel(model); - + return stmt.executeQuery(); } catch (SQLException e) { e.printStackTrace(); } + return null; } } diff --git a/src/main.java b/src/main.java index ccbea8e..920774b 100644 --- a/src/main.java +++ b/src/main.java @@ -1,5 +1,8 @@ import db.jdcb; +import java.sql.ResultSet; +import java.sql.SQLException; + public class main { public static void main(String[] args) { /* @@ -7,12 +10,14 @@ public class main { D.getdata(); D.printList(); */ + Thread mythread = new Thread(() -> new website.Webserver().startserver()); mythread.start(); System.out.println("thread started"); - //new jdcb().executeQuery("select * from user"); + + } } diff --git a/src/website/GetRequest.java b/src/website/GetRequest.java new file mode 100644 index 0000000..0f3ffe8 --- /dev/null +++ b/src/website/GetRequest.java @@ -0,0 +1,49 @@ +package website; + +import com.sun.net.httpserver.Headers; +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; + +import java.io.IOException; +import java.io.OutputStream; +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.HashMap; + +public abstract class GetRequest implements HttpHandler { + @Override + public void handle(HttpExchange httpExchange) throws IOException { + if (httpExchange.getRequestMethod().equals("GET")) { + String query = httpExchange.getRequestURI().getQuery(); + + HashMap params = new HashMap<>(); + + String[] res = query.split("&"); + for (String str : res) { + String[] values = str.split("="); + params.put(values[0], values[1]); + + } + + String response = myrequest(params); + + + Headers h = httpExchange.getResponseHeaders(); + h.set("Content-Type", "application/json"); + httpExchange.sendResponseHeaders(200, 0); + + OutputStream os = httpExchange.getResponseBody(); + os.write(response.getBytes()); + os.close(); + } + } + + /** + * + * @param params received get params from website + * @return json reply to website + */ + public abstract String myrequest(HashMap params); + +} diff --git a/src/website/HttpTools.java b/src/website/HttpTools.java new file mode 100644 index 0000000..2dcb8c5 --- /dev/null +++ b/src/website/HttpTools.java @@ -0,0 +1,19 @@ +package website; + +import java.math.BigInteger; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +public class HttpTools { + public static String StringToMD5(String value) { + try { + MessageDigest md = MessageDigest.getInstance("MD5"); + byte[] messageDigest = md.digest(value.getBytes()); + BigInteger no = new BigInteger(1, messageDigest); + return no.toString(16); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + return ""; + } + } +} diff --git a/src/website/LoginRequest.java b/src/website/LoginRequest.java new file mode 100644 index 0000000..2668066 --- /dev/null +++ b/src/website/LoginRequest.java @@ -0,0 +1,41 @@ +package website; + +import db.jdcb; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.HashMap; + +public class LoginRequest extends PostRequest { + @Override + public String request(HashMap params) { + + String password = params.get("password"); + String username = params.get("username"); + + ResultSet s = new jdcb("users", "kOpaIJUjkgb9ur6S", "wasteinformation").executeQuery("select * from user where username ='" + username + "'"); + + String response = "{\"accept\": false}"; + try { + s.last(); + if (s.getRow() == 1) { + //success + if (HttpTools.StringToMD5(password).equals(s.getString("password"))) { + System.out.println("login success"); + response = "{\"accept\": true}"; + } else { + System.out.println("wrong password"); + } + } else if (s.getRow() == 0) { + //user not found + System.out.println("user not found"); + } else { + //internal error two users with same name...? + } + System.out.println("rowcount: " + s.getRow()); + } catch (SQLException e) { + e.printStackTrace(); + } + return response; + } +} diff --git a/src/website/MainPage.java b/src/website/MainPage.java new file mode 100644 index 0000000..21f3bea --- /dev/null +++ b/src/website/MainPage.java @@ -0,0 +1,57 @@ +package website; + +import com.sun.net.httpserver.Headers; +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URI; + +public class MainPage implements HttpHandler { + @Override + public void handle(HttpExchange t) throws IOException { + String root = "./wwwroot"; + URI uri = t.getRequestURI(); + String path; + + if (uri.getPath().equals("/")) { + path = "/index.html"; + } else { + path = uri.getPath(); + } + System.out.println("looking for: " + root + path); + + File file = new File(root + path).getCanonicalFile(); + + if (!file.isFile()) { + // Object does not exist or is not a file: reject with 404 error. + String response = "404 (Not Found)\n"; + t.sendResponseHeaders(404, response.length()); + OutputStream os = t.getResponseBody(); + os.write(response.getBytes()); + os.close(); + } else { + // Object exists and is a file: accept with response code 200. + String mime = "text/html"; + if (path.substring(path.length() - 3).equals(".js")) mime = "application/javascript"; + if (path.substring(path.length() - 3).equals("css")) mime = "text/css"; + + Headers h = t.getResponseHeaders(); + h.set("Content-Type", mime); + t.sendResponseHeaders(200, 0); + + OutputStream os = t.getResponseBody(); + FileInputStream fs = new FileInputStream(file); + final byte[] buffer = new byte[0x10000]; + int count; + while ((count = fs.read(buffer)) >= 0) { + os.write(buffer, 0, count); + } + fs.close(); + os.close(); + } + } +} \ No newline at end of file diff --git a/src/website/PostRequest.java b/src/website/PostRequest.java new file mode 100644 index 0000000..627779c --- /dev/null +++ b/src/website/PostRequest.java @@ -0,0 +1,48 @@ +package website; + +import com.sun.net.httpserver.Headers; +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.HashMap; + +public abstract class PostRequest implements HttpHandler { + + @Override + public void handle(HttpExchange httpExchange) throws IOException { + if (httpExchange.getRequestMethod().equals("POST")) { + StringBuilder sb = new StringBuilder(); + InputStream ios = httpExchange.getRequestBody(); + int i; + while ((i = ios.read()) != -1) { + sb.append((char) i); + } + String query = sb.toString(); + + HashMap params = new HashMap<>(); + + String[] res = query.split("&"); + for (String str : res) { + String[] values = str.split("="); + params.put(values[0], values[1]); + } + + String response = request(params); + + + Headers h = httpExchange.getResponseHeaders(); + h.set("Content-Type", "application/json"); + httpExchange.sendResponseHeaders(200, 0); + + OutputStream os = httpExchange.getResponseBody(); + os.write(response.getBytes()); + os.close(); + } + } + + public abstract String request(HashMap params); + +} diff --git a/src/website/Webserver.java b/src/website/Webserver.java index 9b5f370..9055d62 100644 --- a/src/website/Webserver.java +++ b/src/website/Webserver.java @@ -1,23 +1,13 @@ package website; -import com.sun.net.httpserver.Headers; -import com.sun.net.httpserver.HttpExchange; -import com.sun.net.httpserver.HttpHandler; import com.sun.net.httpserver.HttpServer; -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; -import java.io.OutputStream; -import java.math.BigInteger; -import java.net.InetSocketAddress; -import java.net.URI; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -public class Webserver{ - public void startserver(){ +import java.net.InetSocketAddress; + +public class Webserver { + public void startserver() { System.out.println("starting server"); HttpServer server = null; try { @@ -27,100 +17,11 @@ public class Webserver{ } server.createContext("/", new MainPage()); - - server.createContext("/senddata/loginget", httpExchange -> { - if (httpExchange.getRequestMethod().equals("GET")){ - String query = httpExchange.getRequestURI().getQuery(); - System.out.println(query); - - HashMap params = new HashMap<>(); - - String[] res = query.split("&"); - for (String str : res){ - String[] values = str.split("="); - params.put(values[0],values[1]); - - } - String password = params.get("password"); - String username = params.get("username"); - - System.out.println(StringToMD5(password)); - //TODO check if user exists in database - - - //send response - String response = "{\"accept\": true}"; - - Headers h = httpExchange.getResponseHeaders(); - h.set("Content-Type", "application/json"); - httpExchange.sendResponseHeaders(200, 0); - - OutputStream os = httpExchange.getResponseBody(); - os.write(response.getBytes()); - os.close(); - } - }); + server.createContext("/senddata/loginget", new LoginRequest()); server.setExecutor(null); // creates a default executor server.start(); } - public String StringToMD5(String value){ - try { - MessageDigest md = MessageDigest.getInstance("MD5"); - byte[] messageDigest = md.digest(value.getBytes()); - BigInteger no = new BigInteger(1, messageDigest); - return no.toString(16); - } catch (NoSuchAlgorithmException e) { - e.printStackTrace(); - return ""; - } - } - static class MainPage implements HttpHandler { - @Override - public void handle(HttpExchange t) throws IOException { - System.out.println("a new request..."); - String root = "./wwwroot"; - URI uri = t.getRequestURI(); - String path; - - if (uri.getPath().equals("/")){ - path = "/index.html"; - }else{ - path = uri.getPath(); - } - System.out.println("looking for: "+ root + path); - - File file = new File(root + path).getCanonicalFile(); - - if (!file.isFile()) { - // Object does not exist or is not a file: reject with 404 error. - String response = "404 (Not Found)\n"; - t.sendResponseHeaders(404, response.length()); - OutputStream os = t.getResponseBody(); - os.write(response.getBytes()); - os.close(); - } else { - // Object exists and is a file: accept with response code 200. - String mime = "text/html"; - if(path.substring(path.length()-3).equals(".js")) mime = "application/javascript"; - if(path.substring(path.length()-3).equals("css")) mime = "text/css"; - - Headers h = t.getResponseHeaders(); - h.set("Content-Type", mime); - t.sendResponseHeaders(200, 0); - - OutputStream os = t.getResponseBody(); - FileInputStream fs = new FileInputStream(file); - final byte[] buffer = new byte[0x10000]; - int count = 0; - while ((count = fs.read(buffer)) >= 0) { - os.write(buffer,0,count); - } - fs.close(); - os.close(); - } - } - } } diff --git a/wwwroot/css/register.css b/wwwroot/css/register.css new file mode 100644 index 0000000..723c163 --- /dev/null +++ b/wwwroot/css/register.css @@ -0,0 +1,89 @@ +/* Made with love by Mutiullah Samim*/ + +@import url('https://fonts.googleapis.com/css?family=Numans'); + +html,body{ +background-image: url('../rsc/login2.jpg'); +background-size: cover; +background-repeat: no-repeat; +height: 100%; +font-family: 'Numans', sans-serif; +} + +.container{ +height: 100%; +align-content: center; +} + +.card{ +height: 470px; +margin-top: auto; +margin-bottom: auto; +width: 400px; +background-color: rgba(0,0,0,0.5) !important; +} + +.social_icon span{ +font-size: 60px; +margin-left: 10px; +color: #FFC312; +} + +.social_icon span:hover{ +color: white; +cursor: pointer; +} + +.card-header h3{ +color: white; +} + +.social_icon{ +position: absolute; +right: 20px; +top: -45px; +} + +.input-group-prepend span{ +width: 50px; +background-color: #FFC312; +color: black; +border:0 !important; +} + +input:focus{ +outline: 0 0 0 0 !important; +box-shadow: 0 0 0 0 !important; + +} + +.remember{ +color: white; +} + +.remember input +{ +width: 20px; +height: 20px; +margin-left: 15px; +margin-right: 5px; +} + +.login_btn{ +color: black; +background-color: #FFC312; +width: 100px; +} + +.login_btn:hover{ +color: black; +background-color: white; +} + +.links{ +color: white; +} + +.links a{ +margin-left: 4px; +} diff --git a/wwwroot/index.html b/wwwroot/index.html index 4c83c34..8e2f5a6 100644 --- a/wwwroot/index.html +++ b/wwwroot/index.html @@ -57,7 +57,7 @@
- Don't have an account?Sign Up + Don't have an account?Sign Up
Forgot your password? diff --git a/wwwroot/js/index.js b/wwwroot/js/index.js index f0bd61e..fb67e8b 100644 --- a/wwwroot/js/index.js +++ b/wwwroot/js/index.js @@ -5,14 +5,23 @@ $(document).ready(function() { var username = $("#userfield")[0].value; var password = $("#passfield")[0].value; - $.get('/senddata/loginget?username='+username+'&password='+password,function(data){ + $.post('/senddata/loginget','username='+username+'&password='+password,function(data){ console.log(data); if (data.accept == true) { console.log("successfully logged in!"); - document.cookie = "username="+username; + document.cookie = "username="+username; window.location = 'settings.html'; } },'json'); }); + + $('#signupbtn').click(function(e) { + e.preventDefault(); + + $.post('/senddata/loginpost','username=luki&password=test',function(data){ + console.log(data); + },'json'); + + }); }); diff --git a/wwwroot/js/register.js b/wwwroot/js/register.js new file mode 100644 index 0000000..38149bd --- /dev/null +++ b/wwwroot/js/register.js @@ -0,0 +1,3 @@ +$(document).ready(function() { + +}); diff --git a/wwwroot/register.html b/wwwroot/register.html new file mode 100644 index 0000000..f032f2a --- /dev/null +++ b/wwwroot/register.html @@ -0,0 +1,88 @@ + + + + + Login Page + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+

Register

+
+
+
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+
+
+
+
+
+ +