Browse Source

testing

jsc2
Evan Feenstra 4 years ago
parent
commit
2d44641ed6
  1. 1
      dist/src/network/receive.js
  2. 2
      dist/src/network/receive.js.map
  3. 1
      dist/src/utils/macaroon.js
  4. 2
      dist/src/utils/macaroon.js.map
  5. 1
      src/network/receive.ts
  6. 1
      src/utils/macaroon.ts

1
dist/src/network/receive.js

@ -332,6 +332,7 @@ function parseAndVerifyPayload(data) {
let v;
if (sig.length === 96 && payload.sender.pub_key) { // => RM THIS
v = yield signer.verifyAscii(msg, sig, payload.sender.pub_key);
console.log("VERIFY", v);
}
if (v && v.valid) {
return payload;

2
dist/src/network/receive.js.map

File diff suppressed because one or more lines are too long

1
dist/src/utils/macaroon.js

@ -12,6 +12,7 @@ function getMacaroon(macName) {
let macLocation = config.macaroon_location;
if (macName) {
macLocation = macLocation.replace(/admin.macaroon/, macName);
console.log('macLocation', macLocation);
}
const m = fs.readFileSync(macLocation);
return m.toString('hex');

2
dist/src/utils/macaroon.js.map

@ -1 +1 @@
{"version":3,"file":"macaroon.js","sourceRoot":"","sources":["../../../src/utils/macaroon.ts"],"names":[],"mappings":";;AAAA,yBAAwB;AACxB,qCAAmC;AAEnC,MAAM,MAAM,GAAG,mBAAU,EAAE,CAAA;AAE3B,IAAI,gBAAgB,GAAW,EAAE,CAAC,CAAC,cAAc;AAEjD,SAAgB,WAAW,CAAC,OAAe;IACzC,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,OAAO,gBAAgB,CAAA;KACxB;SAAM;QACL,IAAI,WAAW,GAAG,MAAM,CAAC,iBAAiB,CAAA;QAC1C,IAAG,OAAO,EAAE;YACV,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;SAC7D;QACD,MAAM,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;QACtC,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;KAC1B;AACH,CAAC;AAXD,kCAWC;AAED,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,gBAAgB,GAAG,GAAG,CAAA;AACxB,CAAC;AAFD,kDAEC"}
{"version":3,"file":"macaroon.js","sourceRoot":"","sources":["../../../src/utils/macaroon.ts"],"names":[],"mappings":";;AAAA,yBAAwB;AACxB,qCAAmC;AAEnC,MAAM,MAAM,GAAG,mBAAU,EAAE,CAAA;AAE3B,IAAI,gBAAgB,GAAW,EAAE,CAAC,CAAC,cAAc;AAEjD,SAAgB,WAAW,CAAC,OAAe;IACzC,IAAI,MAAM,CAAC,MAAM,EAAE;QACjB,OAAO,gBAAgB,CAAA;KACxB;SAAM;QACL,IAAI,WAAW,GAAG,MAAM,CAAC,iBAAiB,CAAA;QAC1C,IAAG,OAAO,EAAE;YACV,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;YAC5D,OAAO,CAAC,GAAG,CAAC,aAAa,EAAC,WAAW,CAAC,CAAA;SACvC;QACD,MAAM,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;QACtC,OAAO,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;KAC1B;AACH,CAAC;AAZD,kCAYC;AAED,SAAgB,mBAAmB,CAAC,GAAW;IAC7C,gBAAgB,GAAG,GAAG,CAAA;AACxB,CAAC;AAFD,kDAEC"}

1
src/network/receive.ts

@ -308,6 +308,7 @@ async function parseAndVerifyPayload(data) {
let v
if (sig.length === 96 && payload.sender.pub_key) { // => RM THIS
v = await signer.verifyAscii(msg, sig, payload.sender.pub_key)
console.log("VERIFY",v)
}
if (v && v.valid) {
return payload

1
src/utils/macaroon.ts

@ -12,6 +12,7 @@ export function getMacaroon(macName?:string) {
let macLocation = config.macaroon_location
if(macName) {
macLocation = macLocation.replace(/admin.macaroon/, macName)
console.log('macLocation',macLocation)
}
const m = fs.readFileSync(macLocation)
return m.toString('hex');

Loading…
Cancel
Save