Fixed the user agent spec for radio selection since mutually exclusive

Author: Marshall Lee Whittaker

background.js

@@ -8,7 +8,7 @@
 var quotesOption = false;
 var programOption = 'sqlmap';
 var verboseOption = false;
-var ruaOption = false;
+var uaOption = 'sqlmapua';
 var dumpallOption = false;
 var osshellOption = false;
 var headers = '';
@@ -20,7 +20,6 @@ var textonlyOption = false;
 var titleonlyOption = false;
 var batchpOption = false;
 var hexOption = false;
-var mobileOption = false;
 var chunkedOption = false;
 var dropcookOption = false;
 var threadsOption = "2";
@@ -91,7 +90,7 @@ let getHeaders = (e) => {
 function assembleCmd(url, referUrl) {
  let sqlmapText = "sqlmap.py"; // sqlmap command holder
  if (verboseOption) {sqlmapText += " -v 4"; };
- if (ruaOption) {sqlmapText += " --random-agent"; };
+ if (uaOption === "rua") {sqlmapText += " --random-agent"; };
  if (dumpallOption) {sqlmapText += " --dump-all"; };
  if (osshellOption) {sqlmapText += " --os-shell"; };
  if (keepaliveOption) {sqlmapText += " --keep-alive"; };
@@ -100,7 +99,7 @@ function assembleCmd(url, referUrl) {
  if (titleonlyOption) {sqlmapText += " --titles"; };
  if (batchpOption) {sqlmapText += " --batch"; };
  if (hexOption) {sqlmapText += " --hex"; };
- if (mobileOption) {sqlmapText += " --mobile"; };
+ if (uaOption === "mobile") {sqlmapText += " --mobile"; };
  if (chunkedOption) {sqlmapText += " --chunked"; };
  if (dropcookOption) {sqlmapText += " --drop-set-cookie"; };
  if (unstableconnOption) {sqlmapText += " --unstable"; };
@@ -194,12 +193,12 @@ browser.contextMenus.onClicked.addListener((info, tab) => {
 
  // check the saved options each click in case they changed
  let gettingOptions = browser.storage.sync.get(
- ['quotes','prog','verbose','rua','dumpall','osshell','sqlmapUser', 'keepalive', 'nullconn', 'textonly', 'titleonly', 'batchp', 'hex', 'mobile', 'chunked', 'dropcook', 'threads', 'unstableconn', 'nocast', 'noescape', 'techb', 'teche', 'techu', 'techs', 'techt', 'techq', 'dbs', 'ctables', 'ccolumns', 'cfiles', 'snackbar'])
+ ['quotes','prog','verbose','ua','dumpall','osshell','sqlmapUser', 'keepalive', 'nullconn', 'textonly', 'titleonly', 'batchp', 'hex', 'chunked', 'dropcook', 'threads', 'unstableconn', 'nocast', 'noescape', 'techb', 'teche', 'techu', 'techs', 'techt', 'techq', 'dbs', 'ctables', 'ccolumns', 'cfiles', 'snackbar'])
  .then((res) => {
  quotesOption = res.quotes;
  programOption = res.prog;
  verboseOption = res.verbose;
- ruaOption = res.rua;
+ uaOption = res.ua;
  dumpallOption = res.dumpall;
  osshellOption = res.osshell;
  sqlmapUserOption = res.sqlmapUser;
@@ -209,7 +208,6 @@ browser.contextMenus.onClicked.addListener((info, tab) => {
  titleonlyOption = res.titleonly;
  batchpOption = res.batchp;
  hexOption = res.hex;
- mobileOption = res.mobile;
  chunkedOption = res.chunked;
  dropcookOption = res.dropcook;
  threadsOption = res.threads;

options.html

@@ -117,10 +117,12 @@
  "unstableconn" /><br />
  </div>
  <div id="request" class="tab-content">
- Use Random User-Agent: <input type="checkbox" name="rua"
- id="rua" /><br />
- Use Mobile User-Agent: <input type="checkbox" name="mobile"
- id="mobile" /><br />
+ Use SQLMap User-Agent: <input type="radio" name="ua" id="ua"
+ value="sqlmapua" /><br />
+ Use Random User-Agent: <input type="radio" name="ua" id="ua"
+ value="rua" /><br />
+ Use Mobile User-Agent: <input type="radio" name="ua" id="ua"
+ value="mobile" /><br />
  HTTP Chunked transfer encoding: <input type="checkbox" name="chunked"
  id="chunked" /><br />
  Drop Set-Cookie header: <input type="checkbox" name="dropcook"

options.js

@@ -3,7 +3,7 @@ function saveOptions(e) {
  quotes: document.querySelector('input[name=quotes]').checked,
  prog: document.querySelector('input[name=prog]:checked').value,
  verbose: document.querySelector('input[name=verbose]').checked,
- rua: document.querySelector('input[name=rua]').checked,
+ ua: document.querySelector('input[name=ua]:checked').value,
  dumpall: document.querySelector('input[name=dumpall]').checked,
  osshell: document.querySelector('input[name=osshell]').checked,
  sqlmapUser: document.querySelector('input[name=sqlmapUser]').value,
@@ -13,7 +13,6 @@ function saveOptions(e) {
  titleonly: document.querySelector('input[name=titleonly]').checked,
  batchp: document.querySelector('input[name=batchp]').checked,
  hex: document.querySelector('input[name=hex]').checked,
- mobile: document.querySelector('input[name=mobile]').checked,
  chunked: document.querySelector('input[name=chunked]').checked,
  dropcook: document.querySelector('input[name=dropcook]').checked,
  threads: document.querySelector('input[name=threads]').value,
@@ -41,14 +40,14 @@ function saveOptions(e) {
 
 function restoreOptions() {
  var gettingItem = browser.storage.sync.get(
- ['quotes', 'prog', 'verbose', 'rua', 'dumpall', 'osshell', 'sqlmapUser', 'keepalive', 'nullconn', 'textonly', 'titleonly', 'batchp', 'hex', 'mobile', 'chunked', 'dropcook', 'threads', 'unstableconn', 'nocast', 'noescape', 'techb', 'teche', 'techu', 'techs', 'techt', 'techq', 'dbs', 'ctables', 'ccolumns', 'cfiles', 'snackbar']);
+ ['quotes', 'prog', 'verbose', 'ua', 'dumpall', 'osshell', 'sqlmapUser', 'keepalive', 'nullconn', 'textonly', 'titleonly', 'batchp', 'hex', 'chunked', 'dropcook', 'threads', 'unstableconn', 'nocast', 'noescape', 'techb', 'teche', 'techu', 'techs', 'techt', 'techq', 'dbs', 'ctables', 'ccolumns', 'cfiles', 'snackbar']);
  gettingItem.then((res) => {
 
  if (Object.keys(res).length > 0 && res.constructor === Object) {
  document.querySelector('input[name=quotes]').checked = res.quotes ? res.quotes : false;
  document.querySelector('input[name=prog][value=' + res.prog + ']').checked = true;
  document.querySelector('input[name=verbose]').checked = res.verbose ? res.verbose : false;
- document.querySelector('input[name=rua]').checked = res.rua ? res.rua : true;
+ document.querySelector('input[name=ua][value=' + res.ua + ']').checked = true;
  document.querySelector('input[name=dumpall]').checked = res.dumpall ? res.dumpall : true;
  document.querySelector('input[name=osshell]').checked = res.osshell ? res.osshell : false;
  document.querySelector('input[name=sqlmapUser]').value = res.sqlmapUser ? res.sqlmapUser : '';
@@ -58,7 +57,6 @@ function restoreOptions() {
  document.querySelector('input[name=titleonly]').checked = res.titleonly ? res.titleonly : false;
  document.querySelector('input[name=batchp]').checked = res.batchp ? res.batchp : false;
  document.querySelector('input[name=hex]').checked = res.hex ? res.hex : false;
- document.querySelector('input[name=mobile]').checked = res.mobile ? res.mobile : false;
  document.querySelector('input[name=chunked]').checked = res.chunked ? res.chunked : false;
  document.querySelector('input[name=dropcook]').checked = res.dropcook ? res.dropcook : false;
  document.querySelector('input[name=threads]').value = res.threads ? res.threads : '2';