Skip to content
Snippets Groups Projects
Commit 904fa3a2 authored by didierfred's avatar didierfred
Browse files

add url contains field

parent 295f867f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
background.js
+ 10
− 1
View file @ 904fa3a2
...@@ -27,6 +27,15 @@ if (localStorage.getItem('config')) { ...@@ -27,6 +27,15 @@ if (localStorage.getItem('config')) {
console.log("save new config"+JSON.stringify(config)); console.log("save new config"+JSON.stringify(config));
localStorage.setItem("config",JSON.stringify(config)); localStorage.setItem("config",JSON.stringify(config));
} }
// If config 1.1 (Simple Modify headers V1.3 to version 1.5) , save to format 1.2
if (config.format_version==="1.1") {
config.format_version="1.2";
for (let line of config.headers) line.url_contains="";
config.use_url_contains=false;
console.log("save new config"+JSON.stringify(config));
localStorage.setItem("config",JSON.stringify(config));
}
} }
else { else {
// else check if old config exist (Simple Modify headers V1.1) // else check if old config exist (Simple Modify headers V1.1)
...@@ -35,7 +44,7 @@ else { ...@@ -35,7 +44,7 @@ else {
let headers = []; let headers = [];
let modifyTable=JSON.parse(localStorage.getItem("modifyTable")); let modifyTable=JSON.parse(localStorage.getItem("modifyTable"));
for (const to_modify of modifyTable) { for (const to_modify of modifyTable) {
headers.push({action:to_modify[0],header_name:to_modify[1],header_value:to_modify[2],comment:"",apply_on:"req",status:to_modify[3]}); headers.push({action:to_modify[0],url_contains:"",header_name:to_modify[1],header_value:to_modify[2],comment:"",apply_on:"req",status:to_modify[3]});
} }
config = {format_version:"1.1",target_page:localStorage.getItem('targetPage'),headers:headers,debug_mode:false}; config = {format_version:"1.1",target_page:localStorage.getItem('targetPage'),headers:headers,debug_mode:false};
// save old config in new format // save old config in new format
......
popup/config.html
+ 3
− 0
View file @ 904fa3a2
...@@ -70,6 +70,7 @@ ...@@ -70,6 +70,7 @@
<table id="table_config" class="table table-condensed " > <table id="table_config" class="table table-condensed " >
<thead> <thead>
<tr id="config_table_head"> <tr id="config_table_head">
<th> When URL contains </th>
<th> Action </th> <th> Action </th>
<th> Header Field Name </th> <th> Header Field Name </th>
<th> Header Field Value </th> <th> Header Field Value </th>
...@@ -120,6 +121,8 @@ ...@@ -120,6 +121,8 @@
<br/> <br/>
<input type="checkbox" id="show_comments"> Show comments </input> <input type="checkbox" id="show_comments"> Show comments </input>
<br/> <br/>
<input type="checkbox" id="use_url_contains"> Filter URL per rules </input>
<br/>
<br/> <br/>
<a href="#" id="exit_parameters_screen_button" class="btn btn-primary btn-sm" style="width:100px"> <a href="#" id="exit_parameters_screen_button" class="btn btn-primary btn-sm" style="width:100px">
<span class="glyphicon glyphicon-step-backward"></span> Back <span class="glyphicon glyphicon-step-backward"></span> Back
......
popup/config.js
+ 85
− 26
View file @ 904fa3a2
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
let line_number = 1; let line_number = 1;
let started = "off"; let started = "off";
let show_comments = true; let show_comments = true;
let use_url_contains = false;
let url_contains_field_size= 18;
let header_name_field_size= 20; let header_name_field_size= 20;
let header_value_field_size= 28; let header_value_field_size= 28;
let comments_field_size= 28; let comments_field_size= 28;
...@@ -24,13 +26,18 @@ window.onload = function() { ...@@ -24,13 +26,18 @@ window.onload = function() {
if (typeof config.show_comments === 'undefined') document.getElementById("show_comments").checked = true; if (typeof config.show_comments === 'undefined') document.getElementById("show_comments").checked = true;
else if (config.show_comments) document.getElementById("show_comments").checked = true; else if (config.show_comments) document.getElementById("show_comments").checked = true;
else show_comments=false; else show_comments=false;
if (config.use_url_contains) {
document.getElementById("use_url_contains").checked = true;
use_url_contains=true;
}
for (let to_add of config.headers) appendLine(to_add.action,to_add.header_name,to_add.header_value,to_add.comment,to_add.apply_on,to_add.status); for (let to_add of config.headers) appendLine(to_add.url_contains,to_add.action,to_add.header_name,to_add.header_value,to_add.comment,to_add.apply_on,to_add.status);
document.getElementById('save_button').addEventListener('click',function (e) {saveData();}); document.getElementById('save_button').addEventListener('click',function (e) {saveData();});
document.getElementById('export_button').addEventListener('click',function (e) {exportData();}); document.getElementById('export_button').addEventListener('click',function (e) {exportData();});
document.getElementById('import_button').addEventListener('click',function (e) {importData(e);}); document.getElementById('import_button').addEventListener('click',function (e) {importData(e);});
document.getElementById('parameters_button').addEventListener('click',function (e) {showParametersScreen();}); document.getElementById('parameters_button').addEventListener('click',function (e) {showParametersScreen();});
document.getElementById('add_button').addEventListener('click',function (e) {appendLine("add","-","-","","req","on");}); document.getElementById('add_button').addEventListener('click',function (e) {appendLine("","add","-","-","","req","on");});
document.getElementById('start_img').addEventListener('click',function (e) {startModify();}); document.getElementById('start_img').addEventListener('click',function (e) {startModify();});
document.getElementById('targetPage').value=config.target_page; document.getElementById('targetPage').value=config.target_page;
document.getElementById('targetPage').addEventListener('keyup',function (e) {checkTargetPageField();}); document.getElementById('targetPage').addEventListener('keyup',function (e) {checkTargetPageField();});
...@@ -40,6 +47,7 @@ window.onload = function() { ...@@ -40,6 +47,7 @@ window.onload = function() {
if (started==="on") document.getElementById("start_img").src = "img/stop.png"; if (started==="on") document.getElementById("start_img").src = "img/stop.png";
document.getElementById('show_comments').addEventListener('click',function (e) {showCommentsClick();}); document.getElementById('show_comments').addEventListener('click',function (e) {showCommentsClick();});
document.getElementById('use_url_contains').addEventListener('click',function (e) {useUrlContainsClick();});
reshapeTable(); reshapeTable();
} }
...@@ -62,6 +70,12 @@ function showCommentsClick() { ...@@ -62,6 +70,12 @@ function showCommentsClick() {
reshapeTable(); reshapeTable();
} }
function useUrlContainsClick() {
if (document.getElementById('use_url_contains').checked) use_url_contains = true;
else use_url_contains = false;
reshapeTable();
}
/** END PARAMETERS SCREEN MANAGEMENT **/ /** END PARAMETERS SCREEN MANAGEMENT **/
...@@ -69,8 +83,11 @@ function showCommentsClick() { ...@@ -69,8 +83,11 @@ function showCommentsClick() {
/** /**
* Add a new configuration line on the UI * Add a new configuration line on the UI
**/ **/
function appendLine(action,header_name,header_value,comment,apply_on,status) { function appendLine(url_contains,action,header_name,header_value,comment,apply_on,status) {
let html = "<td><select class=\"form_control select_field\" id=\"select_action" + line_number + "\" disable=false><option value=\"add\">Add</option><option value=\"modify\">Modify</option><option value=\"delete\">Delete</option></select></td>"; let html = "<td";
if (!use_url_contains) html=html+" hidden";
html = html + "><input class=\"form_control input_field\" size=\""+ url_contains_field_size+ "\" id=\"url_contains"+ line_number + "\"></input></td>";
html = html + "<td><select class=\"form_control select_field\" id=\"select_action" + line_number + "\" disable=false><option value=\"add\">Add</option><option value=\"modify\">Modify</option><option value=\"delete\">Delete</option></select></td>";
html = html + "<td><input class=\"form_control input_field\" size=\"" + header_name_field_size + "\" id=\"header_name"+ line_number + "\"></input></td>"; html = html + "<td><input class=\"form_control input_field\" size=\"" + header_name_field_size + "\" id=\"header_name"+ line_number + "\"></input></td>";
html = html + "<td><input class=\"form_control input_field\" size=\"" + header_value_field_size + "\" id=\"header_value"+ line_number + "\"></input></td>"; html = html + "<td><input class=\"form_control input_field\" size=\"" + header_value_field_size + "\" id=\"header_value"+ line_number + "\"></input></td>";
html = html + "<td"; html = html + "<td";
...@@ -88,6 +105,7 @@ function appendLine(action,header_name,header_value,comment,apply_on,status) { ...@@ -88,6 +105,7 @@ function appendLine(action,header_name,header_value,comment,apply_on,status) {
document.getElementById("config_tab").appendChild(newTR); document.getElementById("config_tab").appendChild(newTR);
document.getElementById("select_action"+line_number).value = action; document.getElementById("select_action"+line_number).value = action;
document.getElementById("apply_on"+line_number).value = apply_on; document.getElementById("apply_on"+line_number).value = apply_on;
document.getElementById("url_contains"+line_number).value = url_contains;
document.getElementById("header_name"+line_number).value = header_name; document.getElementById("header_name"+line_number).value = header_name;
document.getElementById("header_value"+line_number).value = header_value; document.getElementById("header_value"+line_number).value = header_value;
document.getElementById("comment"+line_number).value = comment; document.getElementById("comment"+line_number).value = comment;
...@@ -138,19 +156,39 @@ function reshapeTable() { ...@@ -138,19 +156,39 @@ function reshapeTable() {
let th_elements = document.querySelectorAll("#config_table_head th"); let th_elements = document.querySelectorAll("#config_table_head th");
let tr_elements = document.querySelectorAll("#config_tab tr"); let tr_elements = document.querySelectorAll("#config_tab tr");
if (show_comments) { if (show_comments) {
header_name_field_size= 20; if (use_url_contains) {
header_value_field_size= 28; url_contains_field_size= 18
header_name_field_size= 18;
header_value_field_size= 20;
comments_field_size= 20;
}
else {
header_name_field_size= 20;
header_value_field_size= 28;
comments_field_size= 28;
}
} }
else { else {
header_name_field_size= 34; if (use_url_contains) {
header_value_field_size= 42; url_contains_field_size= 28
header_name_field_size= 20;
header_value_field_size= 28;
}
else {
header_name_field_size= 34;
header_value_field_size= 42;
}
} }
for (i=0;i<tr_elements.length;i++) { for (i=0;i<tr_elements.length;i++) {
tr_elements[i].childNodes[3].hidden = (!show_comments); tr_elements[i].childNodes[4].childNodes[0].size=comments_field_size;
tr_elements[i].childNodes[2].childNodes[0].size=header_value_field_size; tr_elements[i].childNodes[4].hidden = (!show_comments);
tr_elements[i].childNodes[1].childNodes[0].size=header_name_field_size; tr_elements[i].childNodes[3].childNodes[0].size=header_value_field_size;
tr_elements[i].childNodes[2].childNodes[0].size=header_name_field_size;
tr_elements[i].childNodes[0].childNodes[0].size=url_contains_field_size;
tr_elements[i].childNodes[0].hidden = (!use_url_contains);
} }
th_elements[3].hidden = (!show_comments); th_elements[4].hidden = (!show_comments);
th_elements[0].hidden = (!use_url_contains);
} }
...@@ -165,17 +203,19 @@ function create_configuration_data() { ...@@ -165,17 +203,19 @@ function create_configuration_data() {
let debug_mode=false; let debug_mode=false;
let show_comments=false; let show_comments=false;
for (i=0;i<tr_elements.length;i++) { for (i=0;i<tr_elements.length;i++) {
const action = tr_elements[i].childNodes[0].childNodes[0].value; const url_contains = tr_elements[i].childNodes[0].childNodes[0].value;
const header_name = tr_elements[i].childNodes[1].childNodes[0].value; const action = tr_elements[i].childNodes[1].childNodes[0].value;
const header_value = tr_elements[i].childNodes[2].childNodes[0].value; const header_name = tr_elements[i].childNodes[2].childNodes[0].value;
const comment = tr_elements[i].childNodes[3].childNodes[0].value; const header_value = tr_elements[i].childNodes[3].childNodes[0].value;
const apply_on = tr_elements[i].childNodes[4].childNodes[0].value; const comment = tr_elements[i].childNodes[4].childNodes[0].value;
const status = getButtonStatus(tr_elements[i].childNodes[5].childNodes[0]); const apply_on = tr_elements[i].childNodes[5].childNodes[0].value;
headers.push({action:action,header_name:header_name,header_value:header_value,comment:comment,apply_on:apply_on,status:status}); const status = getButtonStatus(tr_elements[i].childNodes[6].childNodes[0]);
headers.push({url_contains:url_contains,action:action,header_name:header_name,header_value:header_value,comment:comment,apply_on:apply_on,status:status});
} }
if (document.getElementById("debug_mode").checked) debug_mode=true ; if (document.getElementById("debug_mode").checked) debug_mode=true ;
if (document.getElementById("show_comments").checked) show_comments=true ; if (document.getElementById("show_comments").checked) show_comments=true ;
let to_export = {format_version:"1.1",target_page:document.getElementById('targetPage').value,headers:headers,debug_mode:debug_mode,show_comments:show_comments}; if (document.getElementById("use_url_contains").checked) use_url_contains=true ;
let to_export = {format_version:"1.2",target_page:document.getElementById('targetPage').value,headers:headers,debug_mode:debug_mode,show_comments:show_comments,use_url_contains:use_url_contains};
return JSON.stringify(to_export); return JSON.stringify(to_export);
} }
...@@ -282,12 +322,27 @@ function readSingleFile(e) { ...@@ -282,12 +322,27 @@ function readSingleFile(e) {
if (config.format_version) { if (config.format_version) {
// if url pattern invalid , set to "" // if url pattern invalid , set to ""
if (!isTargetValid(config.target_page)) config.target_page=""; if (!isTargetValid(config.target_page)) config.target_page="";
// if format file is 1.0 , need to add the apply_on value
// if format file is 1.0 , need to add the apply_on and url_contains value to translate in format 1.2
if (config.format_version==="1.0") { if (config.format_version==="1.0") {
config.format_version="1.1"; config.format_version="1.2";
for (let line of config.headers) line.apply_on="req"; for (let line of config.headers) {
line.apply_on="req";
line.url_contains="";
}
config.debug_mode=false; config.debug_mode=false;
config.show_comments=true;
config.use_url_contains=false;
} }
// if format file is 1.1 , need to add url_contains value to translate in format 1.2
if (config.format_version==="1.1") {
config.format_version="1.2";
for (let line of config.headers) line.url_contains="";
config.show_comments=true;
config.use_url_contains=false;
}
// store the conf in the local storage // store the conf in the local storage
localStorage.setItem("config",JSON.stringify(config)); localStorage.setItem("config",JSON.stringify(config));
// load the new conf // load the new conf
...@@ -302,9 +357,9 @@ function readSingleFile(e) { ...@@ -302,9 +357,9 @@ function readSingleFile(e) {
for (let line_to_load of config) { for (let line_to_load of config) {
var enabled = "off"; var enabled = "off";
if (line_to_load.enabled) enabled = "on"; if (line_to_load.enabled) enabled = "on";
if (line_to_load.action==="Filter") line_to_load.action="delete"; headers.push({action:line_to_load.action.toLowerCase(),header_name:line_to_load.name,header_value:line_to_load.value,comment:line_to_load.comment,apply_on:"req",status:enabled}); if (line_to_load.action==="Filter") line_to_load.action="delete"; headers.push({url_contains:"",action:line_to_load.action.toLowerCase(),header_name:line_to_load.name,header_value:line_to_load.value,comment:line_to_load.comment,apply_on:"req",status:enabled});
} }
let to_load = {format_version:"1.1",target_page:"",headers:headers,debug_mode:false}; let to_load = {format_version:"1.2",target_page:"",headers:headers,debug_mode:false,show_comments:true,use_url_contains:false};
// store the conf in the local storage // store the conf in the local storage
localStorage.setItem("config",JSON.stringify(to_load)); localStorage.setItem("config",JSON.stringify(to_load));
// load the new conf // load the new conf
...@@ -332,6 +387,7 @@ function deleteLine(line_number_to_delete) { ...@@ -332,6 +387,7 @@ function deleteLine(line_number_to_delete) {
for (i=line_number_to_delete;i<line_number-1;i++) { for (i=line_number_to_delete;i<line_number-1;i++) {
const j = i+1; const j = i+1;
document.getElementById("select_action"+i).value = document.getElementById("select_action"+j).value; document.getElementById("select_action"+i).value = document.getElementById("select_action"+j).value;
document.getElementById("url_contains"+i).value = document.getElementById("url_contains"+j).value;
document.getElementById("header_name"+i).value = document.getElementById("header_name"+j).value; document.getElementById("header_name"+i).value = document.getElementById("header_name"+j).value;
document.getElementById("header_value"+i).value = document.getElementById("header_value"+j).value; document.getElementById("header_value"+i).value = document.getElementById("header_value"+j).value;
document.getElementById("comment"+i).value = document.getElementById("comment"+j).value; document.getElementById("comment"+i).value = document.getElementById("comment"+j).value;
...@@ -357,6 +413,7 @@ function invertLine(line1, line2) { ...@@ -357,6 +413,7 @@ function invertLine(line1, line2) {
// Save data for line 1 // Save data for line 1
const select_action1= document.getElementById("select_action"+line1).value; const select_action1= document.getElementById("select_action"+line1).value;
const url_contains1 = document.getElementById("url_contains"+line1).value;
const header_name1 = document.getElementById("header_name"+line1).value; const header_name1 = document.getElementById("header_name"+line1).value;
const header_value1= document.getElementById("header_value"+line1).value; const header_value1= document.getElementById("header_value"+line1).value;
const comment1 = document.getElementById("comment"+line1).value; const comment1 = document.getElementById("comment"+line1).value;
...@@ -365,6 +422,7 @@ function invertLine(line1, line2) { ...@@ -365,6 +422,7 @@ function invertLine(line1, line2) {
// Copy line 2 to line 1 // Copy line 2 to line 1
document.getElementById("select_action"+line1).value = document.getElementById("select_action"+line2).value; document.getElementById("select_action"+line1).value = document.getElementById("select_action"+line2).value;
document.getElementById("url_contains"+line1).value = document.getElementById("url_contains"+line2).value;
document.getElementById("header_name"+line1).value = document.getElementById("header_name"+line2).value; document.getElementById("header_name"+line1).value = document.getElementById("header_name"+line2).value;
document.getElementById("header_value"+line1).value = document.getElementById("header_value"+line2).value; document.getElementById("header_value"+line1).value = document.getElementById("header_value"+line2).value;
document.getElementById("comment"+line1).value = document.getElementById("comment"+line2).value; document.getElementById("comment"+line1).value = document.getElementById("comment"+line2).value;
...@@ -373,6 +431,7 @@ function invertLine(line1, line2) { ...@@ -373,6 +431,7 @@ function invertLine(line1, line2) {
// Copy line 1 to line 2 // Copy line 1 to line 2
document.getElementById("select_action"+line2).value = select_action1; document.getElementById("select_action"+line2).value = select_action1;
document.getElementById("url_contains"+line2).value = url_contains1;
document.getElementById("header_name"+line2).value = header_name1; document.getElementById("header_name"+line2).value = header_name1;
document.getElementById("header_value"+line2).value = header_value1; document.getElementById("header_value"+line2).value = header_value1;
document.getElementById("comment"+line2).value = comment1; document.getElementById("comment"+line2).value = comment1;
......
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