aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcel <cel@lOUVT+Phkvai9a/cCS/RKo+S9hnPAQdVixms/7ldpPA=.ed25519>2020-11-26 18:40:05 -0500
committercel <cel@lOUVT+Phkvai9a/cCS/RKo+S9hnPAQdVixms/7ldpPA=.ed25519>2020-11-27 10:27:51 -0500
commit1bf5278d3088c9b366c19937130c030b41c7cee0 (patch)
tree118beda6703ee46b4e3dd90ad5964c104b3846aa
parenta255497647e95715d232ef3582a5afa1c0e1d7b3 (diff)
downloadpatchfoo-1bf5278d3088c9b366c19937130c030b41c7cee0.tar.gz
patchfoo-1bf5278d3088c9b366c19937130c030b41c7cee0.zip
Support ssb-uri in request URLs and search
-rw-r--r--lib/serve.js35
1 files changed, 35 insertions, 0 deletions
diff --git a/lib/serve.js b/lib/serve.js
index f09bd2f..aad2510 100644
--- a/lib/serve.js
+++ b/lib/serve.js
@@ -25,11 +25,13 @@ var split = require('pull-split')
var utf8 = require('pull-utf8-decoder')
var webresolve = require('ssb-web-resolver')
var Url = require('url')
+var Base64URL = require('base64-url')
module.exports = Serve
var hlCssDir = path.join(require.resolve('highlight.js'), '../../styles')
+var ssbURIRegex = /^(?:\/+)(ssb:(message|blob|feed)([:\/])([^:?]*?)([:/])([^?]*)(\\?.*)?)$/
var urlIdRegex = /^(?:\/+(([%&@]|%25|%26)(?:[A-Za-z0-9\/+]|%2[Ff]|%2[Bb]){43}(?:=|%3D)\.(?:sha256|ed25519))([^?]*)?|(\/.*?))(?:\?(.*))?$/
function ctype(name) {
@@ -448,6 +450,33 @@ Serve.prototype.publishMayRedirect = function (content, cb) {
}
}
+Serve.prototype.translateFromURI = function (url) {
+ var m = ssbURIRegex.exec(url)
+ if (!m) return
+ var uri = m[1]
+ var prefix = m[2]
+ var separator = m[3]
+ var format = m[4]
+ var separator2 = m[5]
+ var hash = m[6]
+ var qs = m[7] || ''
+ if (separator !== separator2) return
+ hash = Base64URL.unescape(hash)
+ if (separator === '/') {
+ // ssb-custom-uri
+ try { hash = decodeURIComponent(hash) }
+ catch(e) {}
+ }
+ var sigil
+ switch (prefix) {
+ case 'message': sigil = '%'; break
+ case 'blob': sigil = '&'; break
+ case 'feed': sigil = '@'; break
+ default: return
+ }
+ return sigil + hash + '.' + format + qs
+}
+
Serve.prototype.handle = function () {
var m = urlIdRegex.exec(this.req.url)
this.query = m[5] ? qs.parse(m[5]) : {}
@@ -499,6 +528,10 @@ Serve.prototype.redirect = function (dest) {
}
Serve.prototype.path = function (url) {
+ if (url.substr(0, 5) === '/ssb:') {
+ var link = this.translateFromURI(url)
+ if (link) return this.redirect(this.app.render.toUrl(link))
+ }
var m
url = url.replace(/^\/+/, '/')
switch (url) {
@@ -732,6 +765,8 @@ Serve.prototype.search = function (ext) {
var maybeId = searchQ.substr(6)
if (u.isRef(maybeId)) searchQ = maybeId
}
+ var link = this.translateFromURI('/' + searchQ)
+ if (link) return self.redirect(self.app.render.toUrl(link))
if (u.isRef(searchQ) || searchQ[0] === '#') {
return self.redirect(self.app.render.toUrl(searchQ))