diff options
| -rw-r--r-- | bugs/issue-e972aae37941e9d9e87b431929135b67168a2ac1.yaml | 19 | ||||
| -rw-r--r-- | data/bzpage.js | 283 | ||||
| -rw-r--r-- | data/rhbzpage.js | 474 | ||||
| -rw-r--r-- | data/util.js | 14 | ||||
| -rw-r--r-- | lib/libbugzilla.js | 108 | ||||
| -rw-r--r-- | lib/main.js | 94 | ||||
| -rw-r--r-- | lib/passwords.js | 1 | ||||
| -rw-r--r-- | lib/xmlrpc.js | 1 |
8 files changed, 544 insertions, 450 deletions
diff --git a/bugs/issue-e972aae37941e9d9e87b431929135b67168a2ac1.yaml b/bugs/issue-e972aae37941e9d9e87b431929135b67168a2ac1.yaml new file mode 100644 index 0000000..bfc3579 --- /dev/null +++ b/bugs/issue-e972aae37941e9d9e87b431929135b67168a2ac1.yaml @@ -0,0 +1,19 @@ +--- !ditz.rubyforge.org,2008-03-06/issue +title: Reload of the process.cgi page +desc: It is awfull to live without it again. +type: :bugfix +component: bugzilla-triage +release: +reporter: Matej Cepl <mcepl@redhat.com> +status: :unstarted +disposition: +creation_time: 2011-02-01 23:55:23.152405 Z +references: [] + +id: e972aae37941e9d9e87b431929135b67168a2ac1 +log_events: +- - 2011-02-01 23:55:23.939288 Z + - Matej Cepl <mcepl@redhat.com> + - created + - "" +trac_id: diff --git a/data/bzpage.js b/data/bzpage.js index c332634..47f14c0 100644 --- a/data/bzpage.js +++ b/data/bzpage.js @@ -1,4 +1,3 @@ -/*jslint forin: true, rhino: true, onevar: false, browser: true, evil: true, laxbreak: true, undef: true, nomen: true, eqeqeq: true, bitwise: true, maxerr: 1000, immed: false, white: false, plusplus: false, regexp: false, undef: false, strict: true */ // Released under the MIT/X11 license // http://www.opensource.org/licenses/mit-license.php "use strict"; @@ -29,7 +28,6 @@ var submitHandlerInstalled = false; // for setUpLogging })); */ function Message(cmd, data) { - console.log("Message: cmd = " + cmd + ", data = " + data); this.cmd = cmd; this.data = data; } @@ -52,27 +50,31 @@ NotLoggedinException.prototype.toString = function () { */ onMessage = function onMessage(msg) { switch (msg.cmd) { - case "ReloadThePage": - document.location.reload(true); - break; - case "RetClipboard": - if (msg.data.cmd == "queryLocal") { - queryInNewTab(msg.data.data, getComponent(), getProduct()); - } else if (msg.data.cmd == "queryUpstream") { - // - } - break; - case "CreateButtons": - constantData = msg.data.constData; - generateButtons(msg.data.instPkgs, msg.data.kNodes); - break; - case "Error": - alert("Error " + msg.data); - break; - case "Unhandled": - break; - default: + case "ReloadThePage": + document.location.reload(true); + break; + case "RetClipboard": + if (msg.data.cmd == "queryLocal") { + queryInNewTab(msg.data.data, getComponent(), getProduct()); + } else if (msg.data.cmd == "queryUpstream") { + // + } + break; + case "CreateButtons": + constantData = msg.data.constData; + generateButtons(msg.data.instPkgs, msg.data.kNodes); + break; + case "Error": + alert("Error " + msg.data); + break; + case "Unhandled": + break; + default: + if (RHOnMessageHandler) { + RHOnMessageHandler(msg); + } else { console.error("Error: unknown RPC call " + msg.toSource()); + } } }; @@ -100,93 +102,102 @@ function executeCommand(cmdObj) { * @param cmdParams Object with the appropriate parameters for the command */ function centralCommandDispatch (cmdLabel, cmdParams) { + console.log("centralCommandDispatch : cmdLabel = " + cmdLabel + + ", cmdParams = " + cmdParams); switch (cmdLabel) { - case "resolution": - case "product": - case "component": - case "version": - case "priority": - selectOption(cmdLabel, cmdParams); - break; - case "status": - selectOption("bug_status", cmdParams); - break; - case "platform": - selectOption("rep_platform", cmdParams); - break; - case "os": - selectOption("op_sys", cmdParams); - break; - case "severity": - selectOption("bug_severity", cmdParams); - break; - case "target": - selectOption("target_milestone", cmdParams); - break; - case "addKeyword": - addStuffToTextBox("keywords",cmdParams); - break; - case "removeKeyword": - removeStuffFromTextBox("keywords", cmdParams); - break; - case "addWhiteboard": - addStuffToTextBox("status_whiteboard",cmdParams); - break; - case "removeWhiteboard": - removeStuffFromTextBox("status_whiteboard",cmdParams); - break; - case "assignee": - changeAssignee(cmdParams); - break; - case "qacontact": - clickMouse("bz_qa_contact_edit_action"); - document.getElementById("qa_contact").value = cmdParams; - break; - case "url": - clickMouse("bz_url_edit_action"); - document.getElementById("bug_file_loc").value = cmdParams; - break; - // TODO dependson/blocked doesn't work. Find out why. - case "addDependsOn": - clickMouse("dependson_edit_action"); - addStuffToTextBox("dependson", cmdParams); - break; - case "removeDependsOn": - clickMouse("dependson_edit_action"); - removeStuffFromTextBox("dependson", cmdParams); - break; - case "addBlocks": - clickMouse("blocked_edit_action"); - addStuffToTextBox("blocked", cmdParams); - break; - case "removeBlocks": - clickMouse("blocked_edit_action"); - removeStuffFromTextBox("blocked", cmdParams); - break; - case "comment": - addStuffToTextBox("comment", cmdParams); - break; - case "commentIdx": - throw "There should be no commentIdx here at all."; - break; - case "setNeedinfo": - // cmdParams are actually ignored for now; we may in future - // distinguish different actors to be target of needinfo - setNeedinfoReporter(); - break; - case "addCC": - addToCCList(cmdParams); - break; - case "queryStringOurBugzilla": - queryForSelection(); - break; - // TODO flags, see also - case "commit": - if (cmdParams) { - // Directly commit the form - document.forms.namedItem("changeform").submit(); - } - break; + case "resolution": + case "product": + case "component": + case "version": + case "priority": + selectOption(cmdLabel, cmdParams); + break; + case "status": + selectOption("bug_status", cmdParams); + break; + case "platform": + selectOption("rep_platform", cmdParams); + break; + case "os": + selectOption("op_sys", cmdParams); + break; + case "severity": + selectOption("bug_severity", cmdParams); + break; + case "target": + selectOption("target_milestone", cmdParams); + break; + case "addKeyword": + addStuffToTextBox("keywords",cmdParams); + break; + case "removeKeyword": + removeStuffFromTextBox("keywords", cmdParams); + break; + case "addWhiteboard": + addStuffToTextBox("status_whiteboard",cmdParams); + break; + case "removeWhiteboard": + removeStuffFromTextBox("status_whiteboard",cmdParams); + break; + case "assignee": + changeAssignee(cmdParams); + break; + case "qacontact": + clickMouse("bz_qa_contact_edit_action"); + document.getElementById("qa_contact").value = cmdParams; + break; + case "url": + clickMouse("bz_url_edit_action"); + document.getElementById("bug_file_loc").value = cmdParams; + break; + // TODO dependson/blocked doesn't work. Find out why. + case "addDependsOn": + clickMouse("dependson_edit_action"); + addStuffToTextBox("dependson", cmdParams); + break; + case "removeDependsOn": + clickMouse("dependson_edit_action"); + removeStuffFromTextBox("dependson", cmdParams); + break; + case "addBlocks": + clickMouse("blocked_edit_action"); + addStuffToTextBox("blocked", cmdParams); + break; + case "removeBlocks": + clickMouse("blocked_edit_action"); + removeStuffFromTextBox("blocked", cmdParams); + break; + case "comment": + addStuffToTextBox("comment", cmdParams); + break; + case "commentIdx": + throw "There should be no commentIdx here at all."; + break; + case "setNeedinfo": + // cmdParams are actually ignored for now; we may in future + // distinguish different actors to be target of needinfo + setNeedinfoReporter(); + break; + case "addCC": + addToCCList(cmdParams); + break; + case "queryStringOurBugzilla": + queryForSelection(); + break; + // TODO flags, see also + case "commit": + if (cmdParams) { + // Directly commit the form + document.forms.namedItem("changeform").submit(); + } + break; + default: + if (RHcentralCommandDispatch) { + RHcentralCommandDispatch(cmdLabel, cmdParams); + } else { + console.error("Unknown command:\n" + cmdLabel + "\nparameters:\n" + cmdParams); + } + break; } } @@ -294,7 +305,7 @@ function addToCommentsDropdown (cmdObj) { * @param parent Node which is a parent of the object * @param callback Function to be called after clicking on the link * @param params Array with parameters of the callback - * @param Boolean breakBefore if there should be a <br> element before. + * @param Boolean before if there should be a <br> element before. * @return none */ function createDeadLink (id, text, parent, callback, params, before, covered, accesskey) { @@ -314,14 +325,18 @@ function createDeadLink (id, text, parent, callback, params, before, covered, ac if (accesskey) { newAElem.setAttribute("accesskey", accesskey); } - newAElem.setAttribute("href", ""); newAElem.textContent = text; - newAElem.addEventListener("click", function(evt) { - callback(params); - evt.stopPropagation(); - evt.preventDefault(); - }, false); + if (typeof callback === "string") { + newAElem.setAttribute("href", callback); + } else { + newAElem.setAttribute("href", ""); + newAElem.addEventListener("click", function(evt) { + callback(params); + evt.stopPropagation(); + evt.preventDefault(); + }, false); + } if ((before === "br") || (before === true)) { locParent.appendChild(document.createElement("br")); @@ -416,20 +431,20 @@ function generateButtons (pkgs, kNodes) { for (var cmdIdx in pkgs[pkg]) { var cmdObj = pkgs[pkg][cmdIdx]; switch (cmdObj.position) { - case "topRow": - createNewButton(topRowPosition, false, cmdObj); - break; - case "bottomRow": - createNewButton(bottomRowPosition, false, cmdObj); - break; - case "dropDown": - addToCommentsDropdown(cmdObj); - break; - default: // [+-]ID - var firstChr = cmdObj.position.charAt(0); - var newId = cmdObj.position.substr(1); - createNewButton(newId, firstChr === "+", cmdObj); - break; + case "topRow": + createNewButton(topRowPosition, false, cmdObj); + break; + case "bottomRow": + createNewButton(bottomRowPosition, false, cmdObj); + break; + case "dropDown": + addToCommentsDropdown(cmdObj); + break; + default: // [+-]ID + var firstChr = cmdObj.position.charAt(0); + var newId = cmdObj.position.substr(1); + createNewButton(newId, firstChr === "+", cmdObj); + break; } } } @@ -850,7 +865,7 @@ function getSelection () { var text = ""; var selectionObject = window.getSelection(); if (selectionObject.rangeCount > 0) { - text = selectionObject.getRangeAt(0).toString(); + text = selectionObject.getRangeAt(0).toString().trim(); } return text; } @@ -899,7 +914,7 @@ function queryInNewTab(text, component, product) { + "&field1-0-2=status_whiteboard&type1-0-2=substring&value1-0-2=" + text; urlStr += searchText; - postMessage(new Message("OpenURLinNewTab", urlStr)); + postMessage(new Message("OpenURLinPanel", urlStr)); } } @@ -990,8 +1005,10 @@ function startup() { checkComments(); - var login = getLogin(); - postMessage(new Message("GetInstalledPackages", window.location.href)); + postMessage(new Message("GetInstalledPackages", { + location: window.location.href, + login: getLogin() + })); } startup(); diff --git a/data/rhbzpage.js b/data/rhbzpage.js index ee10466..484fbff 100644 --- a/data/rhbzpage.js +++ b/data/rhbzpage.js @@ -3,6 +3,65 @@ // http://www.opensource.org/licenses/mit-license.php "use strict"; var titleParsedAttachment = "Part of the thread where crash happened"; + + +// For identification of graphics card +var manuChipStrs = [ [ "ATI Radeon", "ATI", "1002" ], + [ "ATI Mobility Radeon", "ATI", "1002" ], + [ "Intel Corporation", "INTEL", "8086" ], [ "NVIDIA", "NV", "10de" ] ]; + +// http://en.wikipedia.org/wiki/HSL_color_space +// when only the value of S is changed +// stupido!!! the string is value in hex for each color +var RHColor = new Color(158, 41, 43); // RGB 158, 41, 43; HSL 359, 1, 39 +var FedoraColor = new Color(0, 40, 103); // RGB 0, 40, 103; HSL 359, 1, 39 +var RawhideColor = new Color(0, 119, 0); // or "green", or RGB 0, 119, 0, or + // HSL +// 120, 0, 23 +var RHITColor = new Color(102, 0, 102); // RGB 102, 0, 102; HSL 300, 0, 20 + +var RE = { + Comment: new RegExp("^\\s*#"), // unsused + BlankLine: new RegExp("^\\s*$"), // unused + // new line + // [ 65.631] (--) intel(0): Chipset: "845G" + Chipset: new RegExp("^\\s*\\[?[ 0-9.]*\\]?\\s*\\(--\\) "+ + "([A-Za-z]+)\\([0-9]?\\): Chipset: (.*)$"), + ATIgetID: new RegExp("^.*\\(ChipID = 0x([0-9a-fA-F]+)\\).*$"), + Abrt: new RegExp("^\\s*\\[abrt\\]"), + soughtLines: new RegExp("^\\s*(\\[[0-9 .]*\\])?\\s*(\\((EE|WW)\\)|.* [cC]hipsets?: )|\\s*Backtrace") +}; + +var ProfessionalProducts = [ + "Red Hat Enterprise Linux", + "Red Hat Enterprise MRG" +]; + +// END OF CONSTANTS + +var btSnippet = null; +var reqCounter = 0; // TODO should be probably a dict indexed by called method + +function RHOnMessageHandler(msg) { + switch (msg.cmd) { + case "Error": + alert("Error " + msg.data); + break; + case "Unhandled": + break; + case "AddAttachmentCallback": + addAttachmentCallback(msg.data); + break; + case "FixAttachmentMIMECallback": + XMLRPCcallback(); + break; + default: + console.error("Error: unknown RPC call " + msg.toSource()); + } +} + + + // ==================================================================================== // RHBugzillaPage object @@ -13,7 +72,7 @@ var titleParsedAttachment = "Part of the thread where crash happened"; * we haven't set it up. */ nonTestedFunction getDefaultAssignee() { - return util.filterByRegexp(this.constantData.defaultAssignee, + return filterByRegexp(this.constantData.defaultAssignee, this.getComponent()).toLowerCase(); } @@ -35,124 +94,109 @@ function removeDuplicates (arr) { * @return none * sets this.defaultAssignee property according to defaultAssignee list */ -nonTestedFunction setDefaultAssignee() { - this.defaultAssignee = this.getDefaultAssignee(); - var defAss = this.defaultAssignee; +function setDefaultAssignee() { + var defAss = getDefaultAssignee(); // Add setting default assignee - if ((defAss.length > 0) && (defAss !== this.getOwner())) { - this.constantData.defaultAssigneeTrigger = true; - this.createNewButton("bz_assignee_edit_container",true,"rh-common","setDefaultAssignee"); + if ((defAss.length > 0) && (defAss !== getOwner())) { + constantData.defaultAssigneeTrigger = true; + createNewButton("bz_assignee_edit_container",true,"rh-common","setDefaultAssignee"); } } /** * Auxiliary function to compute more complicated resolution */ -nonTestedFunction closeSomeRelease() { +function closeSomeRelease() { // for RAWHIDE close as RAWHIDE, // if active selection -> CURRENTRELEASE // and put the release version to // "Fixed in Version" textbox // otherwise -> NEXTRELEASE - this.selectOption("bug_status", "CLOSED"); - var text = ""; + selectOption("bug_status", "CLOSED"); + var text = getSelection(); var resolution = ""; - if (selection.text) { - text = selection.text.trim(); - } if (text.length > 0) { resolution = "CURRENTRELEASE"; - this.doc.getElementById("cf_fixed_in").value = text; - } else if (this.doc.getElementById("version").value === "rawhide") { + document.getElementById("cf_fixed_in").value = text; + } else if (document.getElementById("version").value === "rawhide") { resolution = "RAWHIDE"; } else { resolution = "NEXTRELEASE"; } - this.centralCommandDispatch("resolution", resolution); + centralCommandDispatch("resolution", resolution); } /** * Additional commands specific for this subclass, overriding superclass one. */ -nonTestedFunction RHcentralCommandDispatch(cmdLabel, cmdParams) { +function RHcentralCommandDispatch(cmdLabel, cmdParams) { console.log("cmdLabel = " + cmdLabel + ", cmdParams = " + cmdParams); switch (cmdLabel) { - // Set up our own commands - case "closeUpstream": - this.addClosingUpstream(); - break; - case "computeResolution": - this.closeSomeRelease(); - break; - case "queryStringUpstreamBugzilla": - this.queryUpstream(); - break; - case "sendBugUpstream": - this.sendBugUpstream(); - break; - case "markTriaged": - this.markBugTriaged(); - break; - case "chipMagic": - var splitArr = cmdParams.split("\t"); - this.fillInWhiteBoard(splitArr[0], splitArr[1]); - break; - // If we don't have it here, call superclass method - default: - centralCommandDispatch.call(this, cmdLabel, cmdParams); - break; + // Set up our own commands + case "closeUpstream": + addClosingUpstream(); + break; + case "computeResolution": + closeSomeRelease(); + break; + case "queryStringUpstreamBugzilla": + queryUpstream(); + break; + case "sendBugUpstream": + sendBugUpstream(); + break; + case "markTriaged": + markBugTriaged(); + break; + case "chipMagic": + var splitArr = cmdParams.split("\t"); + fillInWhiteBoard(splitArr[0], splitArr[1]); + break; + // If we don't have it here, call superclass method + default: + console.error("Unknown command:\n" + cmdLabel + "\nparameters:\n" + cmdParams); + break; } } +function addAttachmentCallback(resp) { + var newAttachID = parseInt(resp.params.param.value.array.data.value.int, 10); + console.log("attachID = " + newAttachID); + // FIXME callback.call(param, newAttachID, data.length); +} + /** * * This has to stay in RHBugzillaPage because upstream doesn't have addAttachment * XML-RPC call yet. */ -nonTestedFunction addAttachment(data, callback, param) { - var msg = new xrpc.XMLRPCMessage("bugzilla.addAttachment"); - var that = this; +function addAttachment(data, callback, param) { + var params = []; - // Get bug no - var bugNo = getBugNo(window.location.toString()); - - // deal with aliases - // FIXME there is no password in content scripts anymore! - if (isNaN(parseInt(bugNo, 10)) && this.password) { - getRealBugNo(function(bugN) { - // Zbytek funkce addAttachment - }); + if (!constantData.passwordState.passAvailable) { + console.log("No password, no XML-RPC calls; sorry"); + return null; } - - - msg.addParameter(this.bugNo); - msg.addParameter({ + params.push(getBugNo()); + params.push({ description: titleParsedAttachment, filename: "parsed-backtrace.txt", contenttype: "text/plain", - data: this.win.btoa(data), + data: window.btoa(data), nomail: true }); - msg.addParameter(this.login); - msg.addParameter(this.password); - Request({ - url: this.constantData.XMLRPCData[this.hostname].url, - onComplete: function(response) { - if (response.status == 200) { - var resp = parseXMLfromString(response.text); - var newAttachID = parseInt(resp.params.param.value.array.data.value.int, 10); - console.log("attachID = " + newAttachID); - callback.call(that, param, newAttachID, data.length); - } - }, - content: msg.xml(), - contentType: "text/xml" - }).post(); - this.reqCounter++; + postMessage(new Message("MakeXMLRPCall", { + url: constantData.XMLRPCData[window.location.hostname], + login: getLogin(), + method: "bugzilla.addAttachment", + params: params, + callRPC: "AddAttachmentCallback" + })); + reqCounter++; } /* === Bugzilla functions === */ @@ -160,13 +204,11 @@ nonTestedFunction addAttachment(data, callback, param) { * */ nonTestedFunction pasteBacktraceInComments() { - var that = this; - /* Let's comment it out, and we'll see if anything breaks. TODO This paragraph looks suspicous ... what is it? Does it belong to this function? - var notedLabel = this.doc.querySelector("label[for='newcc']"); + var notedLabel = document.querySelector("label[for='newcc']"); while (notedLabel.firstChild) { var node = notedLabel.removeChild(notedLabel.firstChild); notedLabel.parentNode.insertBefore(node, notedLabel); @@ -178,41 +220,37 @@ nonTestedFunction pasteBacktraceInComments() { "cmdtype=dorem&remaction=run&namedcmd=all%20NEW%20abrt%20crashes&"+ "sharer_id=74116"; - var mainTitle = this.doc + var mainTitle = document .getElementsByClassName("bz_alias_short_desc_container")[0]; - var abrtButton = this.doc.createElement("a"); - abrtButton.setAttribute("accesskey", "a"); - abrtButton.setAttribute("href", abrtQueryURL); - abrtButton.textContent = "Abrt bugs"; - mainTitle.appendChild(abrtButton); + createDeadLink ("callAbrtQuery_link", + "Abrt bugs", mainTitle, abrtQueryURL, [], false, null, "a"); - if (this.idContainsWord("cf_devel_whiteboard", 'btparsed')) { - this.addStuffToTextBox('status_whiteboard', 'btparsed'); + if (idContainsWord("cf_devel_whiteboard", 'btparsed')) { + addStuffToTextBox('status_whiteboard', 'btparsed'); } - if (!(this.isTriaged() || this.idContainsWord("status_whiteboard", - 'btparsed') || (this.parsedAttachments.length > 0))) { - var btAttachments = this.attachments + if (!(isTriaged() || idContainsWord("status_whiteboard", + 'btparsed') || (parsedAttachments.length > 0))) { + var btAttachments = attachments .filter(function(att, idx, arr) { return (/File: backtrace/.test(att[0])); - }); + }); // TODO we need to go through all backtrace attachments, but // just the first one will do for now, we would need to do async // parsing btAttachments.forEach(function(x) { var attURL = "https://bugzilla.redhat.com/attachment.cgi?id=" + x[1]; - if ((!this.btSnippet) && - (!this.idContainsWord("status_whiteboard", 'btparsed'))) { - var that = this; + if ((!btSnippet) && // ???? FIXME + (!idContainsWord("status_whiteboard", 'btparsed'))) { Request({ url: attURL, onComplete: function(response) { if (response.status == 200) { - that.btSnippet = that.parseBacktrace(response.text); - if (that.btSnippet) { - that.addCheckShowLink.call(that,x,that.btSnippet); + btSnippet = parseBacktrace(response.text); + if (btSnippet) { + addCheckShowLink(x,btSnippet); } } } @@ -234,22 +272,9 @@ nonTestedFunction pasteBacktraceInComments() { * @param id Number of the attachment id * @return none */ -nonTestedFunction showAttachment(id) { - var that = this; - Request({ - url: "https://" + that.hostname + "/attachment.cgi?id=" + id, - onComplete: function (response) { - if (response.status == 200) { - var infoWin = that.win.open("", "Check att. " + id, - "width=640,height=640,status=no,location=no,"+ - "titlebar=no,scrollbars=yes,resizable=yes"+ - "alwaysRaised=yes"); - var doc = infoWin.document; - doc.body.innerHTML = "<pre id='textPre'>"+ - response.text + "</pre>"; - } - } - }).get(); +function showAttachment(id) { + postMessage(new Message("OpenURLinPanel", + "https://" + window.location.hostname + "/attachment.cgi?id=" + id)); } /** @@ -257,10 +282,10 @@ nonTestedFunction showAttachment(id) { * * @param att Attachment object */ -nonTestedFunction addShowParsedBTLink(att) { +function addShowParsedBTLink(att) { var elem = att[4].querySelector("td:last-of-type"); - this.createDeadLink("showParsedBacktraceWindow-" + att[1], "showBT", - elem, this.showAttachment, att[1], true); + createDeadLink("showParsedBacktraceWindow-" + att[1], "showBT", + elem, showAttachment, att[1], true); } /** @@ -269,7 +294,7 @@ nonTestedFunction addShowParsedBTLink(att) { nonTestedFunction addNewAttachmentRow(origAtt, newAttId, newAttSize) { var that = this; - var oldAddBTLink = this.doc.getElementById("attachBacktraceActivator"); + var oldAddBTLink = document.getElementById("attachBacktraceActivator"); oldAddBTLink.parentNode.removeChild(oldAddBTLink); var newTRElem = origAtt[4].cloneNode(true); @@ -315,13 +340,12 @@ nonTestedFunction addNewAttachmentRow(origAtt, * @param snippet String with parsed backtrace * @return none */ -nonTestedFunction addCheckShowLink(oldAtt, snippet) { - var that = this; +function addCheckShowLink(oldAtt, snippet) { var elem = oldAtt[4].querySelector("td:last-of-type"); - this.createDeadLink("attachBacktraceActivator", "add parsed BT", elem, function(x) { + createDeadLink("attachBacktraceActivator", "add parsed BT", elem, function(x) { // pass function and parameters as two separate parameters, the function to be called from // addAttachment - that.addAttachment.call(that, snippet, this.addNewAttachmentRow, oldAtt); + addAttachment(snippet, addNewAttachmentRow, oldAtt); }, [], true); } @@ -334,18 +358,17 @@ nonTestedFunction addCheckShowLink(oldAtt, snippet) { nonTestedFunction markBadAttachments(atts) { var that = this; var badMIMEArray = [ "application/octet-stream", "text/x-log", "undefined" ]; - // FIXME there is no password anymore, we have to fix it somehow else - if (!this.password) { - return ; // User didn't provide password, so whole MIME fixing business - // should be switched off. + if (!constantData.passwordState.passAvailable) { + console.log("No password, no XML-RPC calls; sorry"); + return null; } var badAttachments = atts.filter(function(att, idx, arr) { - return (util.isInList(att[2], badMIMEArray)); + return (isInList(att[2], badMIMEArray)); }); if (badAttachments.length > 0) { - var titleElement = this.doc + var titleElement = document .getElementsByClassName("bz_alias_short_desc_container")[0]; titleElement.style.backgroundColor = "olive"; @@ -365,10 +388,9 @@ nonTestedFunction markBadAttachments(atts) { * * @return Boolean true if it is a RHEL bug */ -nonTestedFunction isEnterprise() { - var prod = this.product; - var result = this.constantData.ProfessionalProducts.some(function(elem,idx,arr) { - return new RegExp(elem).test(prod); +function isEnterprise() { + var result = ProfessionalProducts.some(function(elem,idx,arr) { + return new RegExp(elem).test(getProduct()); }); return result; } @@ -378,8 +400,8 @@ nonTestedFunction isEnterprise() { * * @return Boolean whether the bug has been triaged or not */ -nonTestedFunction isTriaged() { - return this.hasKeyword("Triaged"); +function isTriaged() { + return hasKeyword("Triaged"); } /** @@ -390,70 +412,76 @@ nonTestedFunction isTriaged() { * @param its String with the IsueTracker numbers * @return none */ -nonTestedFunction setBranding() { +function setBranding() { var brandColor = {}; var TriagedColor = {}; - if (this.isEnterprise()) { - if (this.its && (this.its.length > 0)) { - brandColor = this.RHITColor; + var ITbutton = document.getElementById("cf_issuetracker"); + var its = ITbutton ? ITbutton.value.trim() : ""; + + if (isEnterprise()) { + if (its && (its.length > 0)) { + brandColor = RHITColor; } else { - brandColor = this.RHColor; + brandColor = RHColor; } - } else if (new RegExp("Fedora").test(this.product)) { - if (this.doc.getElementById("version").value === "rawhide") { - brandColor = this.RawhideColor; + } else if (new RegExp("Fedora").test(document.getElementById("product").value)) { + if (document.getElementById("version").value === "rawhide") { + brandColor = RawhideColor; } else { - brandColor = this.FedoraColor; + brandColor = FedoraColor; } } // Comment each of the following lines to get only partial branding - this.doc.getElementsByTagName("body")[0].style.background = brandColor + document.getElementsByTagName("body")[0].style.background = brandColor .toString() + " none"; - this.doc.getElementById("titles").style.background = brandColor.toString() + document.getElementById("titles").style.background = brandColor.toString() + " none"; // Remove "Bug" from the title of the bug page, so we have more space with // plenty of tabs - var titleElem = this.doc.getElementsByTagName("title")[0]; + var titleElem = document.getElementsByTagName("title")[0]; titleElem.textContent = titleElem.textContent.slice(4); - var bodyTitleParent = this.doc.getElementById("summary_alias_container").parentNode; + var bodyTitleParent = document.getElementById("summary_alias_container").parentNode; var bodyTitleElem = bodyTitleParent.getElementsByTagName("b")[0]; bodyTitleElem.textContent = bodyTitleElem.textContent.slice(4); // Make background-color of the body of bug salmon pink // for security bugs. - if (this.hasKeyword("Security")) { - this.doc.getElementById("bugzilla-body").style.background = this.SalmonPink + if (hasKeyword("Security")) { + document.getElementById("bugzilla-body").style.background = SalmonPink .toString() + ' none'; } // Make it visible whether the bug has been triaged - if (this.isTriaged()) { - this.doc.getElementById("bz_field_status").style.background = brandColor + if (isTriaged()) { + document.getElementById("bz_field_status").style.background = brandColor .lightColor().toString() + " none"; } +/* TODO this is complicated, because we would need RPC call back and forth. // we should make visible whether maintCCAddr is in CCList - if (util.isInList(this.maintCCAddr, getCCList())) { - var ccEditBoxElem = this.doc.getElementById("cc_edit_area_showhide"); + if (isInList(this.maintCCAddr, getCCList())) { // FIXME this.maintCCAddr ??? + var ccEditBoxElem = document.getElementById("cc_edit_area_showhide"); ccEditBoxElem.style.color = "navy"; ccEditBoxElem.style.fontWeight = "bolder"; ccEditBoxElem.style.textDecoration = "underline"; } +*/ - // mark suspicious components +/* // mark suspicious components FIXME var compElems; - if (this.suspiciousComponents - && util.isInList(this.getComponent(), this.suspiciousComponents) - && (compElems = this.doc + if (suspiciousComponents + && isInList(getComponent(), suspiciousComponents) + && (compElems = document .getElementById("bz_component_edit_container"))) { compElems.style.background = "red none"; } +*/ } /** @@ -465,7 +493,7 @@ nonTestedFunction queryUpstream() { var text = this.getSelectionOrClipboard(); if (text) { var queryUpstreamBugsURLArray = this.constantData.queryUpstreamBug; - var searchData = util.filterByRegexp(queryUpstreamBugsURLArray, this.getComponent()); + var searchData = filterByRegexp(queryUpstreamBugsURLArray, this.getComponent()); var urlBase = searchData.url; text = searchData.searchBy+":"+searchData.fillIn+" "+text.trim(); if (searchData.fillIn == "$$$") { @@ -489,7 +517,7 @@ nonTestedFunction queryUpstream() { */ nonTestedFunction sendBugUpstream() { var that = this; - var urlStr = util.filterByRegexp(JSON.parse(self.data.load("newUpstreamBug.json")), this + var urlStr = filterByRegexp(JSON.parse(self.data.load("newUpstreamBug.json")), this .getComponent()); tabs.open({ @@ -513,7 +541,6 @@ nonTestedFunction sendBugUpstream() { * @return none */ nonTestedFunction addCheckXorgLogLink() { - var that = this; if (this.xorglogAnalysis) { this.XorgLogAttList.forEach(function (row) { var elemS = row[4].getElementsByTagName("td"); @@ -536,7 +563,7 @@ nonTestedFunction fillInWhiteBoard(iLine, driverStr) { var that = this; function groupIDs(manStr, cardStrID) { - var outStr = util.filterByRegexp(that.constantData.chipIDsGroupings, + var outStr = filterByRegexp(that.constantData.chipIDsGroupings, manStr + "," + cardStrID); if (outStr.length === 0) { outStr = "UNGROUPED_" + manStr + "/" + cardStrID; @@ -602,7 +629,7 @@ nonTestedFunction fillInWhiteBoard(iLine, driverStr) { } } this.addStuffToTextBox("status_whiteboard", ("card_" + outStr).trim()); - this.doc.getElementById("chipMagic_btn").style.display = "none"; + document.getElementById("chipMagic_btn").style.display = "none"; } /** @@ -675,7 +702,7 @@ nonTestedFunction analyzeXorgLog(attachID) { return (that.RE.soughtLines.test(line)); }); results.sort(); - results = util.removeDuplicates(results); + results = removeDuplicates(results); // Remove headers if (results.length >= 1) { results.splice(0, 1); @@ -722,12 +749,11 @@ nonTestedFunction getBugzillaName(URLhostname) { * + responseHeaders * + responseText */ -nonTestedFunction XMLRPCcallback() { - var that = this; - this.reqCounter--; - if (this.reqCounter <= 0) { - timer.setTimeout(function () { - that.win.location.reload(true); +function XMLRPCcallback() { + reqCounter--; + if (reqCounter <= 0) { + setTimeout(function () { + window.location.reload(true); }, 1000); } } @@ -755,7 +781,9 @@ nonTestedFunction XMLRPCcallback() { * this change }; * */ -nonTestedFunction fixAttachById(id, type, email) { +function fixAttachById(id, type, email) { + var params = []; + if (type === undefined) { type = "text/plain"; } @@ -763,30 +791,23 @@ nonTestedFunction fixAttachById(id, type, email) { email = false; } - var that = this; - var msg = new xrpc.XMLRPCMessage("bugzilla.updateAttachMimeType"); - msg.addParameter( { + // https://bugzilla.redhat.com/\ + // docs/en/html/api/extensions/compat_xmlrpc/code/webservice.html + // test on https://bugzilla.redhat.com/show_bug.cgi?id=485145 + params.push({ 'attach_id' : id, 'mime_type' : type, 'nomail' : !email }); - msg.addParameter(this.login); - msg.addParameter(this.password); - // https://bugzilla.redhat.com/\ - // docs/en/html/api/extensions/compat_xmlrpc/code/webservice.html - // test on https://bugzilla.redhat.com/show_bug.cgi?id=485145 - Request({ - url: this.constantData.XMLRPCData[this.hostname].url, - onComplete: function(response) { - if (response.status == 200) { - that.XMLRPCcallback.call(that); - } - }, - content: msg.xml(), - contentType: "text/xml" - }).post(); - this.reqCounter++; + postMessage(new Message("MakeXMLRPCall", { + url: constantData.XMLRPCData[window.location.hostname], + login: getLogin(), + method: "bugzilla.updateAttachMimeType", + params: params, + callRPC: "FixAttachmentMIMECallback" + })); + reqCounter++; } /** @@ -796,11 +817,11 @@ nonTestedFunction fixAttachById(id, type, email) { * <TR> DOM jQuery element with a bad attachment * @return none */ -nonTestedFunction addTextLink(row) { +function addTextLink(row) { var elemS = row[4].getElementsByTagName("td"); var elem = elemS[elemS.length - 1]; - this.createDeadLink("addFix2TextLink", "text", elem, - this.fixAttachById, row[1], "br"); + createDeadLink("addFix2TextLink", "text", elem, + fixAttachById, row[1], "br"); } /** @@ -810,21 +831,21 @@ nonTestedFunction addTextLink(row) { * @return none */ nonTestedFunction addClosingUpstream() { - var refs = this.doc.getElementById("external_bugs_table") + var refs = document.getElementById("external_bugs_table") .getElementsByTagName("tr"); // that's a bad id, if there is a one. :) - var inputBox = this.doc.getElementById("inputbox"); + var inputBox = document.getElementById("inputbox"); var externalBugID = 0; var wholeURL = ""; // Fix missing ID on the external_id SELECT - this.doc.getElementsByName("external_id")[0].setAttribute("id", + document.getElementsByName("external_id")[0].setAttribute("id", "external_id"); if (inputBox.value.match(/^http.*/)) { wholeURL= new url.URL(inputBox.value); - externalBugID = util.getBugNo(wholeURL); + externalBugID = getBugNoFromURL(wholeURL); if (externalBugID) { inputBox.value = externalBugID; } @@ -833,7 +854,7 @@ nonTestedFunction addClosingUpstream() { this.selectOptionByLabel("external_id", bugzillaName); } else if (!isNaN(inputBox.value)) { externalBugID = parseInt(inputBox.value, 10); - var bugzillaHostname = this.doc.getElementById("external_id").value; + var bugzillaHostname = document.getElementById("external_id").value; wholeURL = bugzillaHostname+"show_bug.cgi?id="+externalBugID; } else { // no inputBox.value -- maybe there is an external bug from @@ -845,9 +866,9 @@ nonTestedFunction addClosingUpstream() { if ((externalBugID > 0) || (refs.length > 2)) { var msgStr = this.commentStrings.sentUpstreamString; msgStr = msgStr.replace("§§§", wholeURL); - this.centralCommandDispatch("comment",msgStr); - this.centralCommandDispatch("status", "CLOSED"); - this.centralCommandDispatch("resolution", "UPSTREAM"); + centralCommandDispatch("comment",msgStr); + centralCommandDispatch("status", "CLOSED"); + centralCommandDispatch("resolution", "UPSTREAM"); } else { console.log("No external bug specified among the External References!"); } @@ -866,7 +887,7 @@ nonTestedFunction markBugTriaged() { // /fedora-meeting.2009-11-24-15.11.log.html // for F13 and later, ASSIGNED is "add Triaged keyword" (as well) // for <F13 it is "add both" (ASSIGNED status and Triaged keyword) - var ver = this.doc.getElementById("version").value; + var ver = document.getElementById("version").value; if ((!this.isEnterprise()) && (ver <= 12)) { this.selectOption("bug_status", "ASSIGNED"); } @@ -877,26 +898,30 @@ nonTestedFunction markBugTriaged() { * */ nonTestedFunction parseBacktrace (ret) { + var signalHandler = new RegExp("^\\s*#[0-9]*\\s*<signal handler called>"); + var frameNo = new RegExp("^\\s*#([0-9]*)\\s"); + var splitArray = ret.split("\n"); var i = 0, ii = splitArray.length; var outStr = "", curLine = "", numStr = ""; var lineCounter = 0, endLineNo = 0; + // TODO shouldn't we just cut off and analyze whole thread? while (i < ii) { - if (this.RE.signalHandler.test(splitArray[i])) { + if (signalHandler.test(splitArray[i])) { break; } i++; } if (i < ii) { - lineCounter = parseInt(this.RE.frameNo.exec(splitArray[i])[1], 10); + lineCounter = parseInt(frameNo.exec(splitArray[i])[1], 10); endLineNo = lineCounter + NumberOfFrames; curLine = splitArray[i]; while ((lineCounter < endLineNo) && (curLine.trim().length > 0) && (i < ii)) { outStr += curLine + '\n'; - numStr = this.RE.frameNo.exec(curLine); + numStr = frameNo.exec(curLine); if (numStr) { lineCounter = parseInt(numStr[1], 10); } @@ -912,51 +937,18 @@ nonTestedFunction RHBugzillaPage(win, config) { // inheritance ... call superobject's constructor BZPage.call(this, win, config); - // For identification of graphics card - this.manuChipStrs = [ [ "ATI Radeon", "ATI", "1002" ], - [ "ATI Mobility Radeon", "ATI", "1002" ], - [ "Intel Corporation", "INTEL", "8086" ], [ "NVIDIA", "NV", "10de" ] ]; - - // http://en.wikipedia.org/wiki/HSL_color_space - // when only the value of S is changed - // stupido!!! the string is value in hex for each color - this.RHColor = new Color(158, 41, 43); // RGB 158, 41, 43; HSL 359, 1, 39 - this.FedoraColor = new Color(0, 40, 103); // RGB 0, 40, 103; HSL 359, 1, 39 - this.RawhideColor = new Color(0, 119, 0); // or "green", or RGB 0, 119, 0, or - // HSL - // 120, 0, 23 - this.RHITColor = new Color(102, 0, 102); // RGB 102, 0, 102; HSL 300, 0, 20 - - this.RE = { - Comment: new RegExp("^\\s*#"), // unsused - BlankLine: new RegExp("^\\s*$"), // unused - // new line - // [ 65.631] (--) intel(0): Chipset: "845G" - Chipset: new RegExp("^\\s*\\[?[ 0-9.]*\\]?\\s*\\(--\\) "+ - "([A-Za-z]+)\\([0-9]?\\): Chipset: (.*)$"), - ATIgetID: new RegExp("^.*\\(ChipID = 0x([0-9a-fA-F]+)\\).*$"), - Abrt: new RegExp("^\\s*\\[abrt\\]"), - signalHandler: new RegExp("^\\s*#[0-9]*\\s*<signal handler called>"), - frameNo: new RegExp("^\\s*#([0-9]*)\\s"), - soughtLines: new RegExp("^\\s*(\\[[0-9 .]*\\])?\\s*(\\((EE|WW)\\)|.* [cC]hipsets?: )|\\s*Backtrace") - }; - // END OF CONSTANTS - var that = this; this.reqCounter = 0; this.signaturesCounter = 0; this.chipMagicInterestingLine = ""; - this.product = this.doc.getElementById("product").value; - +/* FIXME this would require RPC call this.maintCCAddr = null; if (this.constantData.CCmaintainer) { - this.maintCCAddr = util.filterByRegexp(this.constantData.CCmaintainer, + this.maintCCAddr = filterByRegexp(this.constantData.CCmaintainer, this.getComponent()); } - - var ITbutton = this.doc.getElementById("cf_issuetracker"); - this.its = ITbutton ? ITbutton.value.trim() : ""; +*/ if (!this.constantData.ProfessionalProducts) { this.constantData.ProfessionalProducts = @@ -997,7 +989,7 @@ nonTestedFunction RHBugzillaPage(win, config) { (this.XorgLogAttList[0]) && (this.maintCCAddr === "xgl-maint@redhat.com")) { // Add find chip magic button - var whiteboard_string = this.doc.getElementById("status_whiteboard").value; + var whiteboard_string = document.getElementById("status_whiteboard").value; if (!/card_/.test(whiteboard_string)) { this.fillInChipMagic(); } @@ -1006,7 +998,7 @@ nonTestedFunction RHBugzillaPage(win, config) { // Take care of signature for Fedora bugzappers if (config.gJSONData.configData.signature.length > 0) { var signatureFedoraString = config.gJSONData.configData.signature; - this.doc.forms.namedItem("changeform").addEventListener("submit", + document.forms.namedItem("changeform").addEventListener("submit", function(aEvt) { if (that.signaturesCounter < 1) { that.addStuffToTextBox("comment", signatureFedoraString); @@ -1018,9 +1010,9 @@ nonTestedFunction RHBugzillaPage(win, config) { this.setBranding(); // set default assignee on change of the component - var compElement = this.doc.getElementById("component"); + var compElement = document.getElementById("component"); if (compElement && (compElement.options)) { - this.doc.getElementById("component").addEventListener("change", + document.getElementById("component").addEventListener("change", function() { that.changeAssignee("default"); }, false); diff --git a/data/util.js b/data/util.js index e6871eb..7753458 100644 --- a/data/util.js +++ b/data/util.js @@ -44,14 +44,18 @@ function parseXMLfromString (inStuff) { } /** + * Get a bug no + */ +function getBugNo() { + return document.forms.namedItem('changeform').getElementsByName("id")[0].value; +} + +/** * Get a bug no from URL ... fails with aliases - * It should theoretically belong to bzpage.js, but we don't have - * unit tests there yet, so keeping here. - * * @param url String with URL to be analyzed - * @return String with the bug ID (hopefully number, but not for aliases) + * @return String with the bug ID */ -function getBugNo(url) { +function getBugNoFromURL(url) { var params = getParamsFromURL(url); if (params && params.id) { return params.id; diff --git a/lib/libbugzilla.js b/lib/libbugzilla.js index 0477c70..337a72e 100644 --- a/lib/libbugzilla.js +++ b/lib/libbugzilla.js @@ -1,4 +1,3 @@ -/*jslint rhino: true, forin: true, onevar: false, browser: true, evil: true, laxbreak: true, undef: true, nomen: true, eqeqeq: false, bitwise: true, maxerr: 1000, immed: false, white: false, plusplus: false, regexp: false, undef: false */ // Released under the MIT/X11 license // http://www.opensource.org/licenses/mit-license.php // @@ -12,12 +11,16 @@ var passUtils = require("passwords"); var Request = require("request").Request; var selfMod = require("self"); var urlMod = require("url"); +var xrpc = require("xmlrpc"); +var panelMod = require("panel"); var JSONURLDefault = "https://fedorahosted.org/released"+ "/bugzilla-triage-scripts/Config_data.json"; var BTSPrefNS = "bugzilla-triage.setting."; var BTSPassRealm = "BTSXMLRPCPass"; +var passwords = {}; // hash of passwords indexed by a hostname + function Message(cmd, data) { console.log("Message: cmd = " + cmd + ", data = " + data); this.cmd = cmd; @@ -46,13 +49,9 @@ function parseXMLfromString (inStuff) { * In case URL contains alias, not the real bug number, get the real bug no * from the XML representation. Sets correct value to this.bugNo. * - * somewhere in RPC functions which need it, we should have - * if (isNAN(parseInt(bugNo, 10))) { - * getRealBugNo(bugNo, location, callback); - * } - * Or not + * This is a slow variant for bugs other than actual window */ -function getRealBugNo(bugNo, location, callback) { +function getRealBugNoSlow(bugNo, location, callback) { console.log("We have to deal with bug aliased as " + this.bugNo); // https://bugzilla.redhat.com/show_bug.cgi?ctype=xml&id=serialWacom Request({ @@ -72,20 +71,19 @@ function getRealBugNo(bugNo, location, callback) { }).get(); } -exports.getPassword = function getPassword(login, domain, callback) { +function getPassword(login, domain) { var passPrompt = "Enter your Bugzilla password for fixing MIME attachment types"; var switchPrompt = "Do you want to switch off features requiring password completely"; var prefName = BTSPrefNS+"withoutPassowrd"; - var domain = window.location.protocol + "//" + window.location.hostname; - + var pass = passUtils.getPassword(login, domain, BTSPassRealm); var retObject = { - password: null, - withoutPass: false + password: null, // password string or null if no password provided + withoutPass: false // whether user doesn't want to use password at all }; - - // pass === null means no appropriate password in the storage + + // pass === null means no appropriatjslie password in the storage if (!preferences.get(prefName,false) && (pass === null)) { passwordText = prompts.promptPassword(passPrompt); if (passwordText && passwordText.length > 0) { @@ -102,30 +100,36 @@ exports.getPassword = function getPassword(login, domain, callback) { } else { retObject.password = pass; } - callback(new Message("RetPassword", retObject)); -}; + return retObject; +} exports.changeJSONURL = function changeJSONURL() { var prfNm = BTSPrefNS+"JSONURL"; var url = preferences.get(prfNm,""); - + var reply = prompts.prompt("New location of JSON configuration file", url); if (reply) { preferences.set(prfNm, reply.trim()); // TODO Restartless add-on needs to resolve this. prompts.alert("For now, you should really restart Firefox!"); - } + } }; /** * libbz.getInstalledPackages(msg.data, function (pkgsMsg) { worker.postMessage(pkgsMsg); + + locationLoginObj: { + location: window.location.href, + login: getLogin() + } */ -exports.getInstalledPackages = function getInstalledPackages(location, config, callback) { +exports.getInstalledPackages = function getInstalledPackages(locationLoginObj, config, callback) { var installedPackages = {}; var enabledPackages = []; - + var location = locationLoginObj.location; + if (typeof location == "string") { location = new urlMod.URL(location); } @@ -160,7 +164,7 @@ exports.getInstalledPackages = function getInstalledPackages(location, config, c } }); } - + // Expand commentIdx properties into full comments var cmdObj = {}; for (var pkgKey in installedPackages) { @@ -168,11 +172,27 @@ exports.getInstalledPackages = function getInstalledPackages(location, config, c cmdObj = installedPackages[pkgKey][cmdObjKey]; if ("commentIdx" in cmdObj) { cmdObj.comment = config.gJSONData.commentStrings[cmdObj.commentIdx]; - delete cmdObj.commentIdx; + delete cmdObj.commentIdx; } } } - + + // Investigate situation about password + /* + passwObj = { + password: null, // password string or null if no password provided + withoutPass: false // whether user doesn't want to use password at all + }; */ + var locURL = new urlMod.URL(locationLoginObj.location); + var passDomain = locURL.scheme + "://" + locURL.host; + passwObj = getPassword(locationLoginObj.login, passDomain); + // In order to avoid sending whole password to the content script, + // we are sending just these two Booleans. + config.constantData.passwordState = { + passAvailable: (passwObj.password === null), + withoutPass: passwObj.withoutPass + }; + callback(new Message("CreateButtons", { instPkgs: installedPackages, constData: config.constantData, @@ -187,6 +207,15 @@ exports.getClipboard = function getClipboard(command, cb) { })); }; +exports.openURLInNewPanel = function openURLInNewPanel(url) { + panelMod.Panel({ + contentURL: url, + width: 640, + height: 640, + allow: false // TODO needs to be reviewed + }); +} + exports.openURLinNewTab = function openURLinNewTab(urlStr) { tabs.open({ url: urlStr, @@ -197,9 +226,38 @@ exports.openURLinNewTab = function openURLinNewTab(urlStr) { }); }; +// Make a XML-RPC call ... most of the business logic should stay in the content script +exports.makeXMLRPCCall = function makeXMLRPCCall(url, login, method, params, callback) { + var urlObj = urlMod.URL(url); + var passwObj = getPassword(login, urlObj.schema + "://" + urlObj.host); + if (!passwObj.password) { + return null; // TODO this should happen, only when user presses Escape in password prompt + } + + var msg = new xrpc.XMLRPCMessage(method); + params.forEach(function (par) { + msg.addParameter(par); + }); + msg.addParameter(login); + msg.addParameter(passwObj.password); + + Request({ + url: url, + onComplete: function(response) { + if (response.status == 200) { + var resp = parseXMLfromString(response.text); + callback(resp); + } + }, + content: msg.xml(), + contentType: "text/xml" + }).post(); +}; + exports.initialize = function initialize(config, callback) { var prefName = BTSPrefNS+"JSONURL"; var urlStr = ""; + var passwObj = {}; if (preferences.isSet(prefName)) { urlStr = preferences.get(prefName); @@ -253,7 +311,7 @@ exports.initialize = function initialize(config, callback) { // config.objConstructor = require("mozillabzpage").MozillaBugzilla; // callback(config); - + config.constantData = {}; // TODO this is important and missing if ("constantData" in config.gJSONData) { @@ -263,7 +321,7 @@ exports.initialize = function initialize(config, callback) { config.constantData.XMLRPCData = JSON.parse( selfMod.data.load("XMLRPCdata.json")); } - + if ("CCmaintainer" in config.constantData) { config.defBugzillaMaintainerArr = config.constantData.CCmaintainer; } diff --git a/lib/main.js b/lib/main.js index bf34514..5ba237d 100644 --- a/lib/main.js +++ b/lib/main.js @@ -1,4 +1,3 @@ -/*jslint rhino: true, forin: true, onevar: false, browser: true, evil: true, laxbreak: true, undef: true, nomen: true, eqeqeq: false, bitwise: true, maxerr: 1000, immed: false, white: false, plusplus: false, regexp: false, undef: false */ // Released under the MIT/X11 license // http://www.opensource.org/licenses/mit-license.php // @@ -48,47 +47,56 @@ function skipThisPage(doc) { var messageHandler = exports.messageHandler = function messageHandler(worker, msg) { console.log("messageHandler: msg = " + msg.toSource()); switch (msg.cmd) { - case "LogMessage": - console.log(msg.data); - break; - case "ExecCmd": - libbz.executeCommand(msg.data); - break; - case "AddLogRecord": - logger.addLogRecord(msg.data); - break; - case "GenerateTS": - logger.generateTimeSheet(); - break; - case "ClearTS": - logger.clearTimeSheet(); - break; - case "ImportTS": - logger.importTimeSheet(); - break; - case "GetInstalledPackages": - // send message with packages back - console.log("msg = " + msg.toSource()); - libbz.getInstalledPackages(msg.data, config, function (pkgsMsg) { - worker.postMessage(pkgsMsg); - }); - break; - case "GetClipboard": - libbz.getClipboard(msg.data, function (clipboard) { - worker.postMessage(clipboard); - }); - break; - case "ChangeJSONURL": - libbz.changeJSONURL(); - break; - case "OpenURLinNewTab": - libbz.openURLinNewTab(msg.data); - break; - case "testReady": - // we ignore it here, interesting only in unit test - break; - default: - console.error(msg.toSource()); + case "LogMessage": + console.log(msg.data); + break; + case "ExecCmd": + libbz.executeCommand(msg.data); + break; + case "AddLogRecord": + logger.addLogRecord(msg.data); + break; + case "GenerateTS": + logger.generateTimeSheet(); + break; + case "ClearTS": + logger.clearTimeSheet(); + break; + case "ImportTS": + logger.importTimeSheet(); + break; + case "GetInstalledPackages": + // send message with packages back + libbz.getInstalledPackages(msg.data, config, function (pkgsMsg) { + worker.postMessage(pkgsMsg); + }); + break; + case "GetClipboard": + libbz.getClipboard(msg.data, function (clipboard) { + worker.postMessage(clipboard); + }); + break; + case "ChangeJSONURL": + libbz.changeJSONURL(); + break; + case "OpenURLinPanel": + libbz.openURLinPanel(msg.data); + break; + case "MakeXMLRPCall": + // url, login, method, params, callback + libbz.makeXMLRPCCall(msg.data.url, msg.data.login, msg.data.method, + msg.data.params, function(ret) { + worker.postMessage({ + payback: ret, + cbRPC: msg.data.callRPC + }); + }); + break; + case "testReady": + // we ignore it here, interesting only in unit test + break; + default: + console.error(msg.toSource()); } }; @@ -116,5 +124,3 @@ libbz.initialize(config, function () { } }); }); - -tabs.open("https://bugzilla.redhat.com/show_bug.cgi?id=673153"); diff --git a/lib/passwords.js b/lib/passwords.js index cc9c16b..af76f47 100644 --- a/lib/passwords.js +++ b/lib/passwords.js @@ -1,4 +1,3 @@ -/*jslint forin: true, rhino: true, onevar: false, browser: true, evil: true, laxbreak: true, undef: true, nomen: true, eqeqeq: true, bitwise: true, maxerr: 1000, immed: false, white: false, plusplus: false, regexp: false, undef: false */ // Released under the MIT/X11 license // http://www.opensource.org/licenses/mit-license.php "use strict"; diff --git a/lib/xmlrpc.js b/lib/xmlrpc.js index e883d91..0b84c07 100644 --- a/lib/xmlrpc.js +++ b/lib/xmlrpc.js @@ -1,4 +1,3 @@ -/*jslint rhino: true, forin: true, onevar: false, browser: true */ /*global exports: false */ "use strict"; // Modification of Matěj Cepl released under the MIT/X11 license |