Skip to content
Snippets Groups Projects
Commit bd54341c authored by Anton Bershanskiy's avatar Anton Bershanskiy
Browse files

Build system: npm and webpack (partial) 

Now we can use npm packages as libraries and build with webpack
parent 51ebf91c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitignore
+ 3
− 1
View file @ bd54341c
build/* build/
node_modules/
package-lock.json
source/common/background/cookiestore.js
+ 35
− 7
View file @ bd54341c
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
/* /*
* "Libraries" used by the background * "Libraries" used by the background
* Ideally, these would be generic external libraries, but I didn't find them * Ideally, these would be generic external libraries, but I didn't find them
* TODO: Separate this into a module
* TODO: Webpack https://www.reddit.com/r/webdev/comments/3rdwll/npm_makes_no_sense_to_me/
*/ */
/* /*
...@@ -112,7 +114,9 @@ function onPermissionWebRequestGranted(){ ...@@ -112,7 +114,9 @@ function onPermissionWebRequestGranted(){
* Observe the Cookie header containing cookies being sent to the server * Observe the Cookie header containing cookies being sent to the server
*/ */
function watchCookiesSent(details){ function watchCookiesSent(details){
const protocol = details.url.substring(0, details.url.indexOf("://")) // console.log("Request", details)
const protocol = new URL(details.url).protocol
for (var i = 0; i < details.requestHeaders.length; ++i) { for (var i = 0; i < details.requestHeaders.length; ++i) {
if (details.requestHeaders[i].name === "Cookie") { if (details.requestHeaders[i].name === "Cookie") {
const cookies = details.requestHeaders[i].value.split("; ") const cookies = details.requestHeaders[i].value.split("; ")
...@@ -122,8 +126,8 @@ function onPermissionWebRequestGranted(){ ...@@ -122,8 +126,8 @@ function onPermissionWebRequestGranted(){
const name = cookie.substr(0, index) const name = cookie.substr(0, index)
const value = cookie.substr(index + 1) const value = cookie.substr(index + 1)
if (protocol === "http" && (cookieDatabase[name] === undefined || cookieDatabase[name].secureOrigin === true)){ if (protocol === "http:" && (cookieDatabase[name] === undefined || cookieDatabase[name].secureOrigin === true)){
console.log("LEAK", name) console.log("LEAK", name, value, cookie)
} }
// console.log("Cookie sent: ", cookie, name, value) // console.log("Cookie sent: ", cookie, name, value)
// if (details.initiator.startsWith // if (details.initiator.startsWith
...@@ -142,24 +146,48 @@ function onPermissionWebRequestGranted(){ ...@@ -142,24 +146,48 @@ function onPermissionWebRequestGranted(){
// TODO: support protocols other than HTTP(S) // TODO: support protocols other than HTTP(S)
function watchResponse(details){ function watchResponse(details){
console.log(details) // console.log("Response", details)
// Get additional parameters // Get additional parameters
const protocol = details.url.substring(0, details.url.indexOf("://")) const protocol = new URL(details.url).protocol
for (var i = 0; i < details.responseHeaders.length; ++i) { for (var i = 0; i < details.responseHeaders.length; ++i) {
const headerName = details.responseHeaders[i].name.toLowerCase() const headerName = details.responseHeaders[i].name.toLowerCase()
const headerValue = details.responseHeaders[i].value const headerValue = details.responseHeaders[i].value
switch (headerName){ switch (headerName){
case "set-cookie": case "set-cookie":
const name = headerValue.substring(0, headerValue.indexOf("=")) const name = headerValue.substring(0, headerValue.indexOf("="))
// Options:
// Better: https://www.npmjs.com/package/cookie
// Alternative: https://www.npmjs.com/package/set-cookie-parser
console.log("Cookie set: ", name) console.log("Cookie set: ", name)
cookieDatabase[name] = {secureOrigin: protocol === "https", httpOnly: true} cookieDatabase[name] = {secureOrigin: protocol === "https:", httpOnly: true}
break break
case "strict-transport-security": case "strict-transport-security":
var hstsAttributes = parseResponseHeaderStrictTransportSecurity(headerValue) var hstsAttributes = parseResponseHeaderStrictTransportSecurity(headerValue)
console.log("HSTS", headerValue, hstsAttributes) console.log("HSTS", headerValue, hstsAttributes)
break break
// Options: did not find any, had to write my own
case "content-security-policy":
// Options:
// https://www.npmjs.com/package/content-security-policy-parser
// This one has issues with "block-all-mixed-content", which is important for us https://github.com/helmetjs/content-security-policy-parser/issues/1
//
// https://www.npmjs.com/package/csp-serdes
// Looks abandoned, but might be useful
//
// https://www.npmjs.com/package/csp-parse
// Parses just CSP keys, but not values/directives
//
// https://www.npmjs.com/package/makestatic-parse-csp
// Don't know how it works
//upgrade-insecure-requests
console.log("CSP", headerValue)
break
case "x-content-security-policy":
case "x-webkit-csp":
console.log("CSP Information: " + details.responseHeaders[i].name + " is deprecated and is known to cause problems. https://content-security-policy.com/111")
break
default: default:
// Header not interesting // Header not interesting
} }
......
source/common/pages/popup/popup.html
+ 0
− 1
View file @ bd54341c
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<title></title> <title></title>
<meta charset="utf-8"/> <meta charset="utf-8"/>
<link href="popup.css" rel="stylesheet"/> <link href="popup.css" rel="stylesheet"/>
<script src="/platform.js" defer></script>
<script src="popup.js" defer></script> <script src="popup.js" defer></script>
</head> </head>
<body> <body>
......
source/common/pages/popup/popup.js
+ 2
− 0
View file @ bd54341c
"use strict"; "use strict";
const platform = chrome
// Notify other pages (background) that popup is open // Notify other pages (background) that popup is open
platform.runtime.sendMessage({popupOpen: true, popupTab: "general"}) platform.runtime.sendMessage({popupOpen: true, popupTab: "general"})
......
source/common/platform.js
+ 3
− 1
View file @ bd54341c
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
"use strict"; "use strict";
const platform = chrome; module.exports = {platform: chrome}
//const platform = chrome;
/* Firefox and Chromium provide that same WebExtensions API, /* Firefox and Chromium provide that same WebExtensions API,
* but Chromium calls it 'chrome.cookies' (because they invented it), * but Chromium calls it 'chrome.cookies' (because they invented it),
......
webpack.config.js 0 → 100644
+ 64
− 0
View file @ bd54341c
const path = require("path")
const ncp = require("ncp").ncp
ncp.limit = 16
ncp("./source/common/pages/", "./build/pages/", function (err) {
if (err) {
return console.error(err);
}
console.log('done!');
});
ncp("./source/common/img-t/", "./build/img-t/", function (err) {
if (err) {
return console.error(err);
}
console.log('done!');
});
ncp("./source/common/includes/", "./build/includes/", function (err) {
if (err) {
return console.error(err);
}
console.log('done!');
});
ncp("./source/common/manifest.json", "./build/manifest.json", function (err) {
if (err) {
return console.error(err);
}
console.log('done!');
});
const base = "./source/common/"
const files = [
"background/cookiestore.js",
"content_scripts/inject.js",
"web_accessible_resources/inject.js",
"cookies.js",
"platform.js",
]
var entries = {}
for (var file of files)
entries[file] = base + file
module.exports = {
entry: entries,
output: {
path: path.resolve(__dirname, "build"),
filename: "[name]"
}
}
/*
module.exports = {
entry: "./source/common/content_scripts/inject.js",
output: {
path: path.resolve(__dirname, "build/content_scripts"),
filename: "inject.js"
}
}*/
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment