3wordchant
/
oasis
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #250 from christianbundy/unix-noauth 

Add support for Unix socket with noauth
This commit is contained in:
Cinnamon 2020-02-21 16:05:01 -08:00 committed by GitHub
parent bbbf3f8808 ed5e6e5f61
commit 8eebedff4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cspell.json
View File

@ -28,6 +28,7 @@
"multiserver",
"muxrpc",
"nanohtml",
"noauth",
"nosniff",
"paramap",
"patchbay",

16
src/ssb.js
View File

@ -10,6 +10,16 @@ const ssbConfig = require("ssb-config");
const flotilla = require("@fraction/flotilla");
const ssbTangle = require("ssb-tangle");
const debug = require("debug")("oasis");
const path = require("path");
const socketPath = path.join(ssbConfig.path, "socket");
const publicInteger = ssbConfig.keys.public.replace(".ed25519", "");
const remote = `unix:${socketPath}~noauth:${publicInteger}`;
// This is unnecessary when https://github.com/ssbc/ssb-config/pull/72 is merged
ssbConfig.connections.incoming.unix = [
{ scope: "device", transform: "noauth" }
];
const server = flotilla(ssbConfig);
@ -22,7 +32,7 @@ const log = (...args) => {
const rawConnect = () =>
new Promise((resolve, reject) => {
ssbClient()
ssbClient(null, { remote })
.then(api => {
if (api.tangle === undefined) {
// HACK: SSB-Tangle isn't available in Patchwork, but we want that
@ -64,7 +74,9 @@ const createConnection = config => {
resolve(ssb);
})
.catch(e => {
log(e);
if (e.message !== "could not connect to sbot") {
log(e);
}
connectOrRetry();
});
};