Skip to content
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

Ext auth #408

Merged
merged 5 commits into from
Feb 7, 2024
Merged

Ext auth #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b311103
Add basic auth to extension
Jyyjy Feb 2, 2024
923be54
add password to main script and persist in ext storage
Jyyjy Feb 5, 2024
3ee604a
Remove password from main script
Jyyjy Feb 6, 2024
d2bc4ad
Set auth header with password
Jyyjy Feb 6, 2024
24a5ccd
Get auth header on ext boot
Jyyjy Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions build/UserALEWebExtension/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,6 +1128,7 @@ var defaultConfig = {
useraleConfig: {
url: 'http://localhost:8000',
userId: 'pluginUser',
authHeader: null,
toolName: 'useralePlugin',
version: version
}
Expand All @@ -1144,15 +1145,15 @@ function dispatchTabMessage(message) {
}
browser.runtime.onMessage.addListener(function (message) {
switch (message.type) {
case CONFIG_CHANGE:
options(message.payload);
dispatchTabMessage(message);
break;

// Handles logs rerouted from content and option scripts
case ADD_LOG:
log(message.payload);
break;
case CONFIG_CHANGE:
console.log(message);
options(message.payload);
dispatchTabMessage(message);
break;
default:
console.log('got unknown message type ', message);
}
Expand Down
1 change: 0 additions & 1 deletion build/UserALEWebExtension/content.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,6 @@ function options(newConfig) {
// browser is defined in firefox, but chrome uses the 'chrome' global.
var browser = browser || chrome;
function rerouteLog(log) {
console.log(log);
browser.runtime.sendMessage({
type: ADD_LOG,
payload: log
Expand Down
36 changes: 21 additions & 15 deletions build/UserALEWebExtension/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1100,7 +1100,6 @@ function options(newConfig) {
// browser is defined in firefox, but chrome uses the 'chrome' global.
var browser = browser || chrome;
function rerouteLog(log) {
console.log(log);
browser.runtime.sendMessage({
type: ADD_LOG,
payload: log
Expand Down Expand Up @@ -1130,33 +1129,40 @@ function rerouteLog(log) {
addCallbacks({
reroute: rerouteLog
});
function setConfig(e) {
function setConfig() {
var config = {
url: document.getElementById("url").value,
userId: document.getElementById("user").value,
toolName: document.getElementById("tool").value,
version: document.getElementById("version").value
};

// Set a basic auth header if given credentials.
var password = document.getElementById("password").value;
if (config.userId && password) {
config.authHeader = "Basic " + btoa("".concat(config.userId, ":").concat(password));
}
browser.storage.local.set({
useraleConfig: {
url: document.getElementById("url").value,
userId: document.getElementById("user").value,
toolName: document.getElementById("tool").value,
version: document.getElementById("version").value
}
useraleConfig: config
}, function () {
getConfig();
options(config);
browser.runtime.sendMessage({
type: CONFIG_CHANGE,
payload: config
});
});
}
function getConfig() {
browser.storage.local.get("useraleConfig", function (res) {
var config = res.useraleConfig;
options(config);
document.getElementById("url").value = config.url;
document.getElementById("user").value = config.userId;
document.getElementById("tool").value = config.toolName;
document.getElementById("version").value = config.version;
options(config);
browser.runtime.sendMessage({
type: CONFIG_CHANGE,
payload: config
});
});
}
document.addEventListener('DOMContentLoaded', getConfig);
document.addEventListener("DOMContentLoaded", getConfig);
document.addEventListener("submit", setConfig);

/* eslint-enable */
10 changes: 5 additions & 5 deletions build/UserALEWebExtension/optionsPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
<body>
<h1>Options</h1>
<form>
<label>User ALE Server Host:</label>
<label>Logging Endpoint URL:</label>
<input id="url"/>
<br/>

<label>User ALE Client Script:</label>
<input id="clientScript"/>
<br/>

<label>User:</label>
<input id="user"/>
<br/>

<label>Password:</label>
<input type="password" id="password"/>
<br/>

<label>Tool Name:</label>
<input id="tool"/>
<br/>
Expand Down
12 changes: 7 additions & 5 deletions src/UserALEWebExtension/background.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { browser } from './globals.js';
const defaultConfig = {useraleConfig: {
url: 'http://localhost:8000',
userId: 'pluginUser',
authHeader: null,
toolName: 'useralePlugin',
version: userale.version,
}};
Expand All @@ -45,16 +46,17 @@ function dispatchTabMessage(message) {

browser.runtime.onMessage.addListener(function (message) {
switch (message.type) {
case MessageTypes.CONFIG_CHANGE:
userale.options(message.payload)
dispatchTabMessage(message);
break;

// Handles logs rerouted from content and option scripts
case MessageTypes.ADD_LOG:
userale.log(message.payload);
break;

case MessageTypes.CONFIG_CHANGE:
console.log(message);
userale.options(message.payload);
dispatchTabMessage(message);
break;

default:
console.log('got unknown message type ', message);
}
Expand Down
6 changes: 3 additions & 3 deletions src/UserALEWebExtension/messageTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

var prefix = 'USERALE_';
const prefix = 'USERALE_';

export var CONFIG_CHANGE = prefix + 'CONFIG_CHANGE';
export var ADD_LOG = prefix + 'ADD_LOG';
export const CONFIG_CHANGE = prefix + 'CONFIG_CHANGE';
export const ADD_LOG = prefix + 'ADD_LOG';
38 changes: 23 additions & 15 deletions src/UserALEWebExtension/options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,34 +22,42 @@ import { rerouteLog, browser } from './globals.js';

userale.addCallbacks({reroute: rerouteLog});

function setConfig(e) {
browser.storage.local.set(
{useraleConfig: {
url: document.getElementById("url").value,
userId: document.getElementById("user").value,
toolName: document.getElementById("tool").value,
version: document.getElementById("version").value
}},
() => {getConfig()}
);
// TODO: Warn users when setting credentials with unsecured connection.
const mitmWarning = "Setting credentials with http will expose you to a MITM attack. Are you sure you want to continue?";

function setConfig() {
let config = {
url: document.getElementById("url").value,
userId: document.getElementById("user").value,
toolName: document.getElementById("tool").value,
version: document.getElementById("version").value
};

// Set a basic auth header if given credentials.
const password = document.getElementById("password").value;
if(config.userId && password) {
config.authHeader = "Basic " + btoa(`${config.userId}:${password}`);
}

browser.storage.local.set({useraleConfig: config}, () => {
userale.options(config);
browser.runtime.sendMessage({ type: MessageTypes.CONFIG_CHANGE, payload: config });
});
}

function getConfig() {
browser.storage.local.get("useraleConfig", (res) => {
let config = res.useraleConfig;

userale.options(config);
document.getElementById("url").value = config.url;
document.getElementById("user").value = config.userId;
document.getElementById("tool").value = config.toolName;
document.getElementById("version").value = config.version;

userale.options(config);
browser.runtime.sendMessage({ type: MessageTypes.CONFIG_CHANGE, payload: config });

});
}

document.addEventListener('DOMContentLoaded', getConfig);
document.addEventListener("DOMContentLoaded", getConfig);
document.addEventListener("submit", setConfig);

/* eslint-enable */
10 changes: 5 additions & 5 deletions src/UserALEWebExtension/optionsPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
<body>
<h1>Options</h1>
<form>
<label>User ALE Server Host:</label>
<label>Logging Endpoint URL:</label>
<input id="url"/>
<br/>

<label>User ALE Client Script:</label>
<input id="clientScript"/>
<br/>

<label>User:</label>
<input id="user"/>
<br/>

<label>Password:</label>
<input type="password" id="password"/>
<br/>

<label>Tool Name:</label>
<input id="tool"/>
<br/>
Expand Down
Loading