added handling of append='authority' attribute in URI construction.HEADmaster

Signed-off-by: Michael Krelin <hacker@klever.net>

1 files changed, 2 insertions, 0 deletions

diff --git a/src/components/xriProtocolHandler.js b/src/components/xriProtocolHandler.js
index 3d27784..2e09f64 100755
--- a/src/components/xriProtocolHandler.js
+++ b/src/components/xriProtocolHandler.js
@@ -104,384 +104,386 @@ var nsResolver = {
 

 

 function runExpr(doc, context, expr, returnType)

 {

         if (!returnType)

                 returnType = XP_ANY_TYPE;

         var res = doc.evaluate(expr, context, nsResolver, returnType, null);

         return res;

 }

 

 

 function getNumeric(doc, context, expr)

 {

         var res = runExpr(doc, context, expr, XP_NUMBER_TYPE);

         if (res)

                 return res.numberValue;

         return null;

 }

 

 

 function getString(doc, context, expr)

 {

         // var res = runExpr(doc, context, expr, XPathResult.STRING_TYPE);

         var res = runExpr(doc, context, expr, XP_STRING_TYPE);

         if (res)

                 return res.stringValue;

         return null;

 }

 

 function getNode(doc, context, expr)

 {

         var res = runExpr(doc, context, expr, XP_FIRST_ORDERED_NODE_TYPE);

         if (res)

                 return res.singleNodeValue;

         return null;

 }

 

 

 function getFinalXRD(doc)

 {

         var lastNode = doc.firstChild;

         while (true) {

                 var node = getNode(doc, lastNode, "xrds:XRDS[position()=last()]");

                 if (!node)

                         break;

                 lastNode = node;

         }

 

         return getNode(doc, lastNode, "xrd:XRD[position()=last()]");

 }

 

 

 function isIName(xri)

 {

         if (xri.match('^xri://.!', 'i')) {

                 return false;

         }

         if (xri.match('^.!', 'i')) {

                 return false;

         }

         return true;

 }

 

 

 function arraySearch(a, re)

 {

         var returnArr = new Array();

         var i;

         for (i = 0; i < a.length; i++) {

                 if (a[i].match(re)) {

                         returnArr.push(a[i]);

                 }

         }

 

         return returnArr;

 }

 

 

 function renderService(srv, doc, qxri)

 {

         var html_types = '';

         var html_paths = '';

         var html_mediatypes = '';

         var html_uris = '';

         var html_actions = '';

 

         var serviceName = friendlyServiceName(null);

         var serviceType; // the last non-null Type

         var knownServiceType; // first recognized service type

 

         // get the types

         var res = runExpr(doc, srv, "xrd:Type/text()");

         var t;

         while (t = res.iterateNext()) {

                 if (t.nodeValue) {

                         if (!knownServiceType && isKnownServiceType(t.nodeValue)) {

                                 knownServiceType = t.nodeValue;

                         }

 

                         serviceType = t.nodeValue;

                         html_types += "<strong>Type:</strong> " + t.nodeValue + "<br/>";

                 }

         }

 

         // get the paths

         res = runExpr(doc, srv, "xrd:Path/text()");

         var p;

         var qxri_prefix = qxri;

         if (qxri_prefix.charAt(qxri_prefix.length - 1) != '/') {

                 qxri_prefix += '/';

         }

 

         while (p = res.iterateNext()) {

                 if (p.nodeValue) {

                         html_paths += "<strong>Path:</strong> " + p.nodeValue

                                 + " [ <tt><a href=\"" + qxri_prefix + p.nodeValue + "\">"

                                         + qxri_prefix + p.nodeValue + "</a></tt> ]"

                                 + "<br/>\n";

                 }

         }

 

 

         // get the mediatypes

         mediaTypes = new Array();

         res = runExpr(doc, srv, "xrd:MediaType/text()");

         var m;

         while (m = res.iterateNext()) {

                 if (!knownServiceType) {

                         var srvType = guessServiceTypeByMime(m.nodeValue);

                         knownServiceType = srvType? srvType : null;

                 }

 

                 mediaTypes.push(m.nodeValue);

                 if (m.nodeValue) {

                         html_mediatypes += "<strong>Media Type:</strong> " + m.nodeValue + "<br/>";

                 }

         }

 

 

         res = runExpr(doc, srv, "xrd:URI");

         var uu;

         while (uu = res.iterateNext()) {

                 var u = uu.firstChild;

                 if (!(u.nodeValue && u.nodeType==3))

                         continue;

 

                 var srvType = guessServiceTypeByURI(u.nodeValue);

                 if (!knownServiceType) {

                         knownServiceType = srvType;

                 }

 

                 html_uris += "<div class=\"" + getServiceClass(srvType) + "\">";

 

                 var linkContent = u.nodeValue;

                 var uriParts = u.nodeValue.match('^(.*):(.*)$');

                 if (!uriParts)

                         continue;

 

                 if (uriParts[1] == 'data') {

                         uriParts = uriParts[2].match('^(.*/.*),(.*)');

                         if (uriParts && uriParts[1].match('^image/', 'i')) {

                                 linkContent = "<img src=\"" + u.nodeValue + "\"/>";

                         }

                         else if (uriParts) {

                                 linkContent = uriParts[1] + " data";

                         }

                 }

                 else if (uriParts[1] == 'skype') {

                         uriParts = uriParts[2].match('^(.*)\\?(.*)');

                         if (uriParts) {

                                 if (uriParts[2] == "call") {

                                         linkContent = "<img src=\"chrome://foxri/content/skype_call_large.png\" alt=\"Call " + uriParts[1] + "\"/>";

                                 }

                                 else if (uriParts[2] == "chat") {

                                         linkContent = "<img src=\"chrome://foxri/content/skype_chat_large.png\" alt=\"Chat with " + uriParts[1] + "\"/>";

                                 }

                                 else if (uriParts[2] == "add") {

                                         linkContent = "<img src=\"chrome://foxri/content/skype_add_large.png\" alt=\"Add " + uriParts[1] + " to Skype\"/>";

                                 }

                         }

                 }

                 else if (uriParts[1] == 'aim') {

                         uriParts = uriParts[2].match('^(.*)\\?.*screenname=([^&]*)', 'i');

                         if (uriParts) {

                                 linkContent = "<img src=\"chrome://foxri/content/aim_logo.gif\" alt=\"Chat with " + uriParts[2] + "\"/> Chat with " + uriParts[2];

                         }

                 }

 

                 var linkhref = u.nodeValue;

                 var xrap = uu.getAttribute('append');

                 if(xrap=='qxri') {

                         linkhref += qxri.replace(/^xri:\/\//,'');

+                }else if(xrap=='authority') {

+                        linkhref += qxri.replace(/^xri:\/\//,'').replace(/\//.*,'');

                 }else if(xrap!=null){

                         dump("Unhandled @append: "+xrap+"\n");

                 }

                 html_uris += "<a href=\""+linkhref+"\">"

                         + linkContent + "</a>";

                 html_uris += "</div>";

         }

 

         var html = "<div class=\"service srv_" + getServiceClass(knownServiceType) + "\">\n";

         html += html_types;

         html += html_paths;

         html += html_mediatypes;

         if (html_uris) {

                 html +=  "<strong>URI(s):</strong><br/>\n";

                 html += html_uris;

         }

         html += "</div>";

 

         return html;

 }

 

 

 

 function isKnownServiceType(type)

 {

         if (type.toLowerCase() in SERVICE_CLASSES) {

                 return true;

         }

         return false;

 }

 

 function getServiceClass(type)

 {

         if (type && isKnownServiceType(type)) {

                 return SERVICE_CLASSES[type.toLowerCase()];

         }

         return type;

 }

 

 

 function guessServiceTypeByURI(uri)

 {

         if (uri == null || uri == "") {

                 return "unknown";

         }

         if (uri.match(/^https?:/i)) {

                 return "www";

         }

         else if (uri.match(/^skype:/i)) {

                 return "skype";

         }

         else if (uri.match(/^aim:/i)) {

                 return "aim";

         }

         else if (uri.match(/^xmpp:/i)) {

                 return "jabber";

         }

         else if (uri.match(/^tel:/i)) {

                 return "tel";

         }

         else if (uri.match(/^callto:/i)) {

                 return "callto";

         }

         else if (uri.match(/^telnet:/i)) {

                 return "telnet";

         }

         else if (uri.match(/^news:/i)) {

                 return "news";

         }

         else if (uri.match(/^nntp:/i)) {

                 return "nntp";

         }

         else if (uri.match(/^ftp:/i)) {

                 return "ftp";

         }

         else if (uri.match(/^mailto:/i)) {

                 return "email";

         }

         else if (uri.match(/^urn:/i)) {

                 return "urn";

         }

         else if (uri.match(/^data:/i)) {

                 return "data";

         }

         else if (uri.match(/^feed:/i)) {

                 return "feed";

         }

         return "unknown";

 }

 

 

 function guessServiceTypeByMime(mimeType)

 {

         if (mimeType.match(/^application\/(rss|atom)\+xml/i)) {

                 dump("feed detected!\n");

                 return "feed";

         }

         else if (mimeType.match(/^image\//i)) {

                 return "image";

         }

         return null;

 }

 

 

 

 function friendlyServiceName(srvType, uri)

 {

         if (srvType && srvType == "xri://+i-service*(+contact)*($v*1.0)") {

                 return "Contact Service";

         }

         else if (srvType && (

                              srvType == "http://openid.net/signon/1.0"

                              || srvType == "http://openid.net/signon/1.1"

                              || srvType == "http://specs.openid.net/auth/2.0/signon"

                              || srcType == "http://specs.openid.net/auth/2.0/server"

                             ) ) {

                 return "OpenID Authentication Service";

         }

         else if (srvType && srvType == "xri://$res*auth*($v*2.0)") {

                 return "Authority Resolution Service";

         }

         else {

                 if (uri == null) {

                         return "Generic Service";

                 }

                 if (uri.match(/^https?:/i)) {

                         return "Web Link";

                 }

                 else if (uri.match(/^skype:/i)) {

                         var user = uri.substring("skype:".length, uri.indexOf('?'));

                         return "Skype <a href=\"" + uri + "\"><img src=\"chrome://foxri/content/skype_call.png\"></a>";

                 }

                 else if (uri.match(/^mailto:/i)) {

                         var qmark = uri.indexOf('?');

                         var email = (qmark == -1)?

                                 uri.substr("mailto:".length) :

                                 uri.substring("mailto:".length, qmark);

                         return "Email (address: " + email + ")";

                 }

                 else if (srvType != null) {

                         return srvType; // return verbatim

                 }

                 return "Generic Service";

         }

 }

 

 

 

 

 function subHTML(template, vars)

 {

         for (key in vars) {

                 template = template.replace(key, vars[key], 'g');

         }

         return template;

 }

 

 

 /// Given the completed XMLHttpRequest object, renders the XRDS

 function renderXRDS(xmlDoc)

 {

         var x = xmlDoc;

         var qxri = getString(x, x, "/xrds:XRDS/@ref");

 

         var html = subHTML(HTML_HEAD, { '#QXRI#': qxri });

 

         // TODO: render parents as well

 

         var lastNode = getFinalXRD(x);

         if (lastNode) {

                 var stat = getString(x, lastNode, "xrd:Status/@code");

                 if (stat == "100") {

                         html += "<h3>Exploring <strong>" + qxri + "</strong></h3>";

                 }

                 else {

                         var msg = getString(x, lastNode, "xrd:Status/text()");

                         html += "<h3 class=\"error\"><strong>" + qxri + "</strong> failed to resolve (reason: " + stat + " - " + msg + ")</h3>";

                 }

 

                 html += "<br/>";

 

                 var services = runExpr(x, lastNode, "xrd:Service");

                 var s;

                 var count = getNumeric(x, lastNode, "count(xrd:Service)");

                 if (count > 0) {

                         while (s = services.iterateNext()) {

                                 count++;

                                 html += renderService(s, x, qxri);

                         }

                 }

                 else if (stat == '222') {

                         var xriType = isIName(qxri)? 'I-name' : 'I-number';