From 1e2d2c0408810e0e26cde707d96018133c61360c Mon Sep 17 00:00:00 2001 From: daragh Date: Sun, 24 Dec 2023 22:15:06 +0000 Subject: [PATCH 01/18] feat : added frontend for getting ssh keys --- src/ssh.html | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 src/ssh.html diff --git a/src/ssh.html b/src/ssh.html new file mode 100644 index 0000000..879ad51 --- /dev/null +++ b/src/ssh.html @@ -0,0 +1,90 @@ + + + + + SSH + + + + +
+
+ Sharky, our mascot +

Skynet Self Service

+
+
+

SSH

+

+ Add / Remove SSH Keys from your account. +

+ Enter Username and Password to see your current keys. +

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


+
+

+ + +
+
+ UL Computer Society 2023-2023 + +
+
+ + -- 2.46.1 From 115f0257e5a914abc48bceb9c490e218c3a49525 Mon Sep 17 00:00:00 2001 From: daragh Date: Sat, 30 Dec 2023 01:47:41 +0000 Subject: [PATCH 02/18] feat : frontend for adding & deleting keys --- src/scripts/ssh.js | 127 ++++++++++++++++++++++++++++++++++++++++++++ src/ssh.html | 128 ++++++++++++++++++++------------------------- 2 files changed, 185 insertions(+), 70 deletions(-) create mode 100644 src/scripts/ssh.js diff --git a/src/scripts/ssh.js b/src/scripts/ssh.js new file mode 100644 index 0000000..b791691 --- /dev/null +++ b/src/scripts/ssh.js @@ -0,0 +1,127 @@ +let got_keys = false; + +function get_keys() { + console.log("get_keys running , got_keys = ", got_keys); + let username = document.getElementById("user").value; + let password = document.getElementById("pass").value; + let request = {auth: {user: username, pass: password}}; + + fetch('http://127.0.0.1:8087/ldap/ssh', { + method: 'POST', + body: JSON.stringify(request), + mode: 'cors', + }).then(res => { + if (res.status === 200) { + return res.json(); + } else { + document.getElementById('formStatus').innerHTML = "Failed to fetch"; + } + }).then(data => { + if (data.result === "success") { + document.getElementById('formStatus').innerHTML = "Success : Got keys"; + let keys = data.success; + document.getElementById('key_table').style.display = "table"; + got_keys = true; + keys.forEach(key => { + add_to_table(key); + }) + } else { + document.getElementById('formStatus').innerHTML = "Failed to get keys"; + } + }).catch(err => { + console.log(err); + }); +} + +function add_key() { + let username = document.getElementById("user").value; + let password = document.getElementById("pass").value; + let key = document.getElementById("key_input").value; + let request = {auth: {user: username, pass: password}, key: key}; + if (key === "") { + document.getElementById('formStatus').innerHTML = "Key cannot be empty"; + return; + } + fetch('http://127.0.0.1:8087/ldap/add', { + method: 'POST', + body: JSON.stringify(request), + mode: 'cors', + }).then(res => { + if (res.status === 200) { + return res.json(); + } else { + document.getElementById('formStatus').innerHTML = "Failed to fetch"; + } + + }).then(data => { + if (data.result === "success") { + document.getElementById('formStatus').innerHTML = "Success : Key added"; + document.getElementById('key_table').style.display = "table"; + add_to_table(key); + } else { + document.getElementById('formStatus').innerHTML = "Failed to add"; + } + }).catch(err => { + document.getElementById('formStatus').innerHTML = "Error "; + console.log(err); + }); +} + +function delete_key(row_idx) { + let table = document.getElementById("key_table"); + let key = table.rows[row_idx].cells[0].innerHTML; + let username = document.getElementById("user").value; + let password = document.getElementById("pass").value; + let request = {auth: {user: username, pass: password}, key: key}; + + fetch('http://127.0.0.1:8087/ldap/delete', { + method: 'DELETE', + body: JSON.stringify(request), + mode: 'cors', + }).then(res => { + if (res.status === 200) { + return res.json(); + } else { + document.getElementById('formStatus').innerHTML = "Failed to fetch"; + } + }).then(data => { + if (data.result === "success") { + table.deleteRow(row_idx); + document.getElementById('formStatus').innerHTML = "Success : Key deleted"; + } else { + document.getElementById('formStatus').innerHTML = "Failed to delete"; + } + }).catch(err => { + document.getElementById('formStatus').innerHTML = "Error "; + console.log(err); + }) +} + +function add_to_table(key) { + let table = document.getElementById("key_table"); + let row = table.insertRow(); + let cell1 = row.insertCell(0); + cell1.innerHTML = key; + let cell2 = row.insertCell(1); + + let button = document.createElement("button"); + button.innerHTML = "Delete"; + cell2.appendChild(button); + //cell2.appendChild(document.createElement("button")).innerHTML = "Delete"; + button.addEventListener("click", function () { + delete_key(row.rowIndex); + }); +} + +document.addEventListener("DOMContentLoaded", () => { + document.getElementById("get_keys").addEventListener("click", function () { + if (got_keys) { + console.log("got keys already"); + document.getElementById('formStatus').innerHTML = "Got keys already"; + } else { + get_keys(); + } + }); + document.getElementById("add_key_button").addEventListener("click", add_key); +}); + diff --git a/src/ssh.html b/src/ssh.html index 879ad51..be524f3 100644 --- a/src/ssh.html +++ b/src/ssh.html @@ -1,90 +1,78 @@ - + SSH - - -
-
+ + + + + + +
+
Sharky, our mascot

Skynet Self Service

-
-
+
+

SSH

- Add / Remove SSH Keys from your account. -

- Enter Username and Password to see your current keys. + Add / Remove SSH Keys from your account.

- - - - - - - - - - - - -


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


+ +

- - -
-
+ + + + + + + +
KeyRemove
+ + +
UL Computer Society 2023-2023 -
-
- + + + -- 2.46.1 From 0af81c6efa79522abbdce86942aea13f738cffb0 Mon Sep 17 00:00:00 2001 From: daragh Date: Sat, 30 Dec 2023 01:55:45 +0000 Subject: [PATCH 03/18] fix : fetch paths --- src/scripts/ssh.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/scripts/ssh.js b/src/scripts/ssh.js index b791691..b4ec2dd 100644 --- a/src/scripts/ssh.js +++ b/src/scripts/ssh.js @@ -7,6 +7,7 @@ function get_keys() { let request = {auth: {user: username, pass: password}}; fetch('http://127.0.0.1:8087/ldap/ssh', { + // can switch this to get with auth headers i think method: 'POST', body: JSON.stringify(request), mode: 'cors', @@ -42,7 +43,7 @@ function add_key() { document.getElementById('formStatus').innerHTML = "Key cannot be empty"; return; } - fetch('http://127.0.0.1:8087/ldap/add', { + fetch('http://127.0.0.1:8087/ldap/ssh/add', { method: 'POST', body: JSON.stringify(request), mode: 'cors', @@ -74,7 +75,7 @@ function delete_key(row_idx) { let password = document.getElementById("pass").value; let request = {auth: {user: username, pass: password}, key: key}; - fetch('http://127.0.0.1:8087/ldap/delete', { + fetch('http://127.0.0.1:8087/ldap/ssh', { method: 'DELETE', body: JSON.stringify(request), mode: 'cors', -- 2.46.1 From 7f40a4b259cea66884a8508a88b8faa667af4847 Mon Sep 17 00:00:00 2001 From: daragh Date: Sat, 30 Dec 2023 04:07:35 +0000 Subject: [PATCH 04/18] feat : added link to SSH page from main page Might also need to remove SSH stuff from modify page --- src/index.html | 94 +++++++++++++++++++++++++++----------------------- 1 file changed, 51 insertions(+), 43 deletions(-) diff --git a/src/index.html b/src/index.html index e1faf23..91bb0fa 100644 --- a/src/index.html +++ b/src/index.html @@ -1,65 +1,73 @@ - + Skynet Self Service - - -
-
+ + +
+
Sharky, our mascot

Skynet Self Service

-
-
+
+
-

- Sign-up -

-

- Please use this if you have yet to activate an account on Skynet before. -

+

+ Sign-up +

+

+ Please use this if you have yet to activate an account on Skynet before. +

-

- Change Password -

-

- Please use this service to change your Skynet password -

+

+ Change Password +

+

+ Please use this service to change your Skynet password. +

-

- Account modification -

-

- Please use this service to modify your user data (email, login ssh key, etc.) -

+

+ Account modification +

+

+ Please use this service to modify your user data (email, login ssh key, etc.). +

-

- Forgot your username? -

-

- Please use this service to get a reminder email with your Skynet username -

+

+ Forgot your username? +

+

+ Please use this service to get a reminder email with your Skynet username. +

-

- Forgot your password? -

-

- Please use this service to reset your password. -

+

+ Forgot your password? +

+

+ Please use this service to reset your password. +

-
-
+
+

+ SSH +

+

+ Please use this service to manage your SSH keys. +

+
+ +
UL Computer Society 2023-2023 -
-
- + + + \ No newline at end of file -- 2.46.1 From 128794648c3b918f068962cb4a48330b5a2e04df Mon Sep 17 00:00:00 2001 From: daragh Date: Sat, 30 Dec 2023 23:27:32 +0000 Subject: [PATCH 05/18] feat : made input for new key textarea, split keys on their comment to display in table. Made js code use async/await instead of then. Works fine with mockoon but might need more testing with actual LDAP server. --- src/index.html | 2 +- src/scripts/ssh.js | 128 ----------------------------- src/{ssh.html => ssh/index.html} | 27 ++++--- src/ssh/ssh.js | 134 +++++++++++++++++++++++++++++++ 4 files changed, 153 insertions(+), 138 deletions(-) delete mode 100644 src/scripts/ssh.js rename src/{ssh.html => ssh/index.html} (68%) create mode 100644 src/ssh/ssh.js diff --git a/src/index.html b/src/index.html index 91bb0fa..aaa5fcd 100644 --- a/src/index.html +++ b/src/index.html @@ -55,7 +55,7 @@

- SSH + SSH

Please use this service to manage your SSH keys. diff --git a/src/scripts/ssh.js b/src/scripts/ssh.js deleted file mode 100644 index b4ec2dd..0000000 --- a/src/scripts/ssh.js +++ /dev/null @@ -1,128 +0,0 @@ -let got_keys = false; - -function get_keys() { - console.log("get_keys running , got_keys = ", got_keys); - let username = document.getElementById("user").value; - let password = document.getElementById("pass").value; - let request = {auth: {user: username, pass: password}}; - - fetch('http://127.0.0.1:8087/ldap/ssh', { - // can switch this to get with auth headers i think - method: 'POST', - body: JSON.stringify(request), - mode: 'cors', - }).then(res => { - if (res.status === 200) { - return res.json(); - } else { - document.getElementById('formStatus').innerHTML = "Failed to fetch"; - } - }).then(data => { - if (data.result === "success") { - document.getElementById('formStatus').innerHTML = "Success : Got keys"; - let keys = data.success; - document.getElementById('key_table').style.display = "table"; - got_keys = true; - keys.forEach(key => { - add_to_table(key); - }) - } else { - document.getElementById('formStatus').innerHTML = "Failed to get keys"; - } - }).catch(err => { - console.log(err); - }); -} - -function add_key() { - let username = document.getElementById("user").value; - let password = document.getElementById("pass").value; - let key = document.getElementById("key_input").value; - let request = {auth: {user: username, pass: password}, key: key}; - if (key === "") { - document.getElementById('formStatus').innerHTML = "Key cannot be empty"; - return; - } - fetch('http://127.0.0.1:8087/ldap/ssh/add', { - method: 'POST', - body: JSON.stringify(request), - mode: 'cors', - }).then(res => { - if (res.status === 200) { - return res.json(); - } else { - document.getElementById('formStatus').innerHTML = "Failed to fetch"; - } - - }).then(data => { - if (data.result === "success") { - document.getElementById('formStatus').innerHTML = "Success : Key added"; - document.getElementById('key_table').style.display = "table"; - add_to_table(key); - } else { - document.getElementById('formStatus').innerHTML = "Failed to add"; - } - }).catch(err => { - document.getElementById('formStatus').innerHTML = "Error "; - console.log(err); - }); -} - -function delete_key(row_idx) { - let table = document.getElementById("key_table"); - let key = table.rows[row_idx].cells[0].innerHTML; - let username = document.getElementById("user").value; - let password = document.getElementById("pass").value; - let request = {auth: {user: username, pass: password}, key: key}; - - fetch('http://127.0.0.1:8087/ldap/ssh', { - method: 'DELETE', - body: JSON.stringify(request), - mode: 'cors', - }).then(res => { - if (res.status === 200) { - return res.json(); - } else { - document.getElementById('formStatus').innerHTML = "Failed to fetch"; - } - }).then(data => { - if (data.result === "success") { - table.deleteRow(row_idx); - document.getElementById('formStatus').innerHTML = "Success : Key deleted"; - } else { - document.getElementById('formStatus').innerHTML = "Failed to delete"; - } - }).catch(err => { - document.getElementById('formStatus').innerHTML = "Error "; - console.log(err); - }) -} - -function add_to_table(key) { - let table = document.getElementById("key_table"); - let row = table.insertRow(); - let cell1 = row.insertCell(0); - cell1.innerHTML = key; - let cell2 = row.insertCell(1); - - let button = document.createElement("button"); - button.innerHTML = "Delete"; - cell2.appendChild(button); - //cell2.appendChild(document.createElement("button")).innerHTML = "Delete"; - button.addEventListener("click", function () { - delete_key(row.rowIndex); - }); -} - -document.addEventListener("DOMContentLoaded", () => { - document.getElementById("get_keys").addEventListener("click", function () { - if (got_keys) { - console.log("got keys already"); - document.getElementById('formStatus').innerHTML = "Got keys already"; - } else { - get_keys(); - } - }); - document.getElementById("add_key_button").addEventListener("click", add_key); -}); - diff --git a/src/ssh.html b/src/ssh/index.html similarity index 68% rename from src/ssh.html rename to src/ssh/index.html index be524f3..955f38f 100644 --- a/src/ssh.html +++ b/src/ssh/index.html @@ -3,15 +3,25 @@ SSH - - - + + + -

@@ -63,7 +62,8 @@
SSH Keys
- +
diff --git a/src/ssh/ssh.js b/src/ssh/ssh.js index 515c363..66a4cce 100644 --- a/src/ssh/ssh.js +++ b/src/ssh/ssh.js @@ -4,30 +4,30 @@ async function get_keys() { let username = document.getElementById("user").value; let password = document.getElementById("pass").value; let request = {auth: {user: username, pass: password}}; - try { const response = await fetch('https://api.account.skynet.ie/ldap/ssh', { method: 'POST', body: JSON.stringify(request), mode: 'cors', }); - if (response.status === 200) { - const data = await response.json(); - if (data.result === "success") { - document.getElementById('formStatus').innerHTML = "Success: Got keys"; - let keys = data.success; - document.getElementById('key_table').style.display = "table"; - got_keys = true; - keys.forEach(key => { - add_to_table(key); - }); - } else { - document.getElementById('formStatus').innerHTML = "Error: Failed to get keys"; - } - } else { + if (response.status !== 200) { document.getElementById('formStatus').innerHTML = "Failed to fetch"; + return; } + const data = await response.json(); + if (data.result !== "success") { + document.getElementById('formStatus').innerHTML = `Error: ${data.error}`; + return; + } + document.getElementById('formStatus').innerHTML = "Success: Got keys"; + let keys = data.success; + document.getElementById('key_table').style.display = "table"; + got_keys = true; + keys.forEach(key => { + add_to_table(key); + }); } catch (err) { + document.getElementById('formStatus').innerHTML = `Error: ${err}`; console.log(err); } } @@ -48,20 +48,21 @@ async function add_key() { body: JSON.stringify(request), mode: 'cors', }); - if (response.status === 200) { - const data = await response.json(); - if (data.result === "success") { - document.getElementById('formStatus').innerHTML = "Success: Key added"; - document.getElementById('key_table').style.display = "table"; - add_to_table(request.key); - } else { - document.getElementById('formStatus').innerHTML = "Error:Failed to add"; - } - } else { + if (response.status !== 200) { document.getElementById('formStatus').innerHTML = "Failed to fetch"; + return; } + const data = await response.json(); + if (data.result !== "success") { + document.getElementById('formStatus').innerHTML = `Error: ${data.error}`; + return; + } + document.getElementById('formStatus').innerHTML = "Success: Key added"; + document.getElementById('key_table').style.display = "table"; + add_to_table(request.key); + } catch (err) { - document.getElementById('formStatus').innerHTML = "Error "; + document.getElementById('formStatus').innerHTML = `Error: ${err}`; console.log(err); } } @@ -78,46 +79,46 @@ async function delete_key(row_idx) { body: JSON.stringify(request), mode: 'cors', }); - if (response.status === 200) { - const data = await response.json(); - if (data.result === "success") { - table.deleteRow(row_idx); - document.getElementById('formStatus').innerHTML = "Success: Key deleted"; - } else { - document.getElementById('formStatus').innerHTML = "Error: Failed to delete"; - } - } else { + if (response.status !== 200) { document.getElementById('formStatus').innerHTML = "Failed to fetch"; + return; } + const data = await response.json(); + if (data.result !== "success") { + document.getElementById('formStatus').innerHTML = `Error: ${data.error}`; + return; + } + table.deleteRow(row_idx); + document.getElementById('formStatus').innerHTML = "Success: Key deleted"; + } catch (err) { - document.getElementById('formStatus').innerHTML = "Error "; + document.getElementById('formStatus').innerHTML = `Error: ${err}`; console.log(err); } } function add_to_table(key) { let table = document.getElementById("key_table"); - let new_row = table.insertRow(); - let name_cell = new_row.insertCell(0); - let key_cell = new_row.insertCell(1); + let row = table.insertRow(); + let cell_name = row.insertCell(0); + let cell_key = row.insertCell(1); //Splitting by spaces, first two make the key + type, rest is a comment/name of the key let key_split = key.split(' '); - let key_string = key_split[0] + ' ' + key_split[1]; - key_cell.textContent = key_string; + cell_key.textContent = `${key_split[0]} ${key_split[1]}`; //Names for SSH keys can have multiple spaces let comment = ""; for (i = 2; i < key_split.length; i++) { comment += " " + key_split[i]; } - name_cell.textContent = comment; - let delete_cell = new_row.insertCell(2); + cell_name.textContent = comment; + let cell_delete = row.insertCell(2); let delete_button = document.createElement("button"); delete_button.innerHTML = "Delete"; - delete_cell.appendChild(delete_button); - delete_cell.addEventListener("click", function () { - delete_key(new_row.rowIndex); + cell_delete.appendChild(delete_button); + cell_delete.addEventListener("click", function () { + delete_key(row.rowIndex); }); } -- 2.46.1 From c6e071448536783c984c35dcbcdb493947c57beb Mon Sep 17 00:00:00 2001 From: daragh Date: Sun, 31 Dec 2023 08:35:16 +0000 Subject: [PATCH 08/18] fmt : newline --- src/ssh/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ssh/index.html b/src/ssh/index.html index a7938e7..f571120 100644 --- a/src/ssh/index.html +++ b/src/ssh/index.html @@ -14,7 +14,6 @@ table, th { border: 1px solid; - } td { -- 2.46.1 From 7100dad705ee2b929b0f46f15ff04b2b821a90f8 Mon Sep 17 00:00:00 2001 From: daragh Date: Mon, 1 Jan 2024 17:02:37 +0000 Subject: [PATCH 09/18] fix : moved ssh stuff int src/ --- src/index.html | 8 ++++++++ src/{ssh/index.html => modify_ssh.html} | 6 +++--- src/{ssh => }/ssh.js | 0 3 files changed, 11 insertions(+), 3 deletions(-) rename src/{ssh/index.html => modify_ssh.html} (89%) rename src/{ssh => }/ssh.js (100%) diff --git a/src/index.html b/src/index.html index 5741c3b..8df2167 100644 --- a/src/index.html +++ b/src/index.html @@ -53,6 +53,14 @@ Please use this service to reset your password.

+
+

+ Forgot your 2FA code? +

+

+ Please use this service to reset your 2FA code. +

+