git.iko.soy/bridge
on master help sign in
Merge pull request #305 from urbit/fix/view-code

Fix/view code

commit578aec1cacebcd0b1da7121403383ecd07ddf0d6 authorAnthony Arroyo <anthony@tlon.io> dateThu 17 Oct 2019, 08:37 (7 years ago) parentcc8b6e55ae308f
4 files changed+83−7
compare with master
unifiedsplit
src/lib/keys.js+4−4 src/lib/networkCode.js+50 src/lib/useKeyfileGenerator.js+15−3 src/views/Point.js+14
src/lib/keys.js+4−4
@@ -59,6 +59,9 @@ const jam = seed => {
5959// simple alias to avoid importing kg into component scope
6060export const deriveNetworkKeys = seed => kg.deriveNetworkKeys(seed);
6161
62+export const createRing = pair =>
63+ pair.crypt.private + pair.auth.private + NETWORK_KEY_CURVE_PARAMETER;
64+
6265/**
6366 * @param {object} pair
6467 * @param {number} point
@@ -66,10 +69,7 @@ export const deriveNetworkKeys = seed => kg.deriveNetworkKeys(seed);
6669 * @return {string}
6770 */
6871export const compileNetworkingKey = (pair, point, revision) => {
69− const bnsec = new BN(
70− pair.crypt.private + pair.auth.private + NETWORK_KEY_CURVE_PARAMETER,
71− 'hex'
72− );
72+ const bnsec = new BN(createRing(pair), 'hex');
7373
7474 const sed = noun.dwim(
7575 noun.Atom.fromInt(point),
src/lib/networkCode.jsnew file+50
@@ -0,0 +1,50 @@
1+import { hex2patp } from 'urbit-ob';
2+import { createRing } from 'lib/keys';
3+
4+import jssha256 from 'js-sha256';
5+
6+function shax(buf) {
7+ const hashed = jssha256.sha256.array(buf);
8+ return Buffer.from(hashed);
9+}
10+
11+function hex2buf(hex) {
12+ return Buffer.from(hex, 'hex').reverse();
13+}
14+
15+function buf2hex(buf) {
16+ return Buffer.from(buf)
17+ .reverse()
18+ .toString('hex');
19+}
20+
21+function shas(buf, salt) {
22+ return shax(xor(salt, shax(buf)));
23+}
24+
25+function xor(a, b) {
26+ const length = Math.max(a.byteLength, b.byteLength);
27+ const result = new Uint8Array(length);
28+ for (let i = 0; i < length; i++) {
29+ result[i] = a[i] ^ b[i];
30+ }
31+ return result;
32+}
33+
34+function shaf(buf, salt) {
35+ const result = shas(buf, salt);
36+ const halfway = result.length / 2;
37+ const front = result.slice(0, halfway);
38+ const back = result.slice(halfway, result.length);
39+ return xor(front, back);
40+}
41+
42+export const generateCode = pair => {
43+ const ring = hex2buf(createRing(pair));
44+ const salt = hex2buf('73736170'); // salt is the noun %pass
45+ const hash = shax(ring);
46+ const result = shaf(hash, salt);
47+ const half = result.slice(0, result.length / 2);
48+
49+ return hex2patp(buf2hex(half));
50+};
src/lib/useKeyfileGenerator.js+15−3
@@ -8,6 +8,7 @@ import { useWallet } from 'store/wallet';
88import { usePointCursor } from 'store/pointCursor';
99
1010import * as need from 'lib/need';
11+import { generateCode } from 'lib/networkCode';
1112
1213import {
1314 attemptNetworkSeedDerivation,
@@ -28,10 +29,15 @@ export default function useKeyfileGenerator(manualNetworkSeed) {
2829 const [generating, setGenerating] = useState(true);
2930 const [keyfile, setKeyfile] = useState(false);
3031
32+ const [code, setCode] = useState(false);
33+
3134 const _point = need.point(pointCursor);
32− const _details = need.details(getDetails(_point));
35+ const details = getDetails(_point);
3336
34− const networkRevision = convertToInt(_details.keyRevisionNumber, 10);
37+ const networkRevision = details.matchWith({
38+ Just: ({ value }) => convertToInt(value.keyRevisionNumber, 10),
39+ Nothing: () => 0,
40+ });
3541 const { isOwner, isManagementProxy } = useCurrentPermissions();
3642
3743 const hasNetworkingKeys = networkRevision > 0;
@@ -48,6 +54,8 @@ export default function useKeyfileGenerator(manualNetworkSeed) {
4854 return;
4955 }
5056
57+ const _details = need.details(details);
58+
5159 const networkSeed = manualNetworkSeed
5260 ? Just(manualNetworkSeed)
5361 : await attemptNetworkSeedDerivation({
@@ -71,6 +79,8 @@ export default function useKeyfileGenerator(manualNetworkSeed) {
7179
7280 const pair = deriveNetworkKeys(_networkSeed);
7381
82+ setCode(generateCode(pair));
83+
7484 if (!keysMatchChain(pair, _details)) {
7585 setGenerating(false);
7686 setNotice('Derived networking keys do not match on-chain details.');
@@ -88,7 +98,8 @@ export default function useKeyfileGenerator(manualNetworkSeed) {
8898 urbitWallet,
8999 wallet,
90100 authMnemonic,
91− _details,
101+ setCode,
102+ details,
92103 _point,
93104 ]);
94105
@@ -113,6 +124,7 @@ export default function useKeyfileGenerator(manualNetworkSeed) {
113124 downloaded,
114125 download,
115126 notice,
127+ code,
116128 };
117129
118130 return { ...values, bind: values };
src/views/Point.js+14
@@ -10,6 +10,7 @@ import View from 'components/View';
1010import Greeting from 'components/Greeting';
1111import Passport from 'components/Passport';
1212import { ForwardButton, BootArvoButton } from 'components/Buttons';
13+import CopyButton from 'components/CopyButton';
1314import { matchBlinky } from 'components/Blinky';
1415import DownloadSigilButton from 'components/DownloadSigilButton';
1516
@@ -18,6 +19,7 @@ import useInvites from 'lib/useInvites';
1819import { useSyncOwnedPoints } from 'lib/useSyncPoints';
1920import useCurrentPermissions from 'lib/useCurrentPermissions';
2021import { useLocalRouter } from 'lib/LocalRouter';
22+import useKeyfileGenerator from 'lib/useKeyfileGenerator';
2123
2224export default function Point() {
2325 const { pop, push, names } = useLocalRouter();
@@ -26,6 +28,8 @@ export default function Point() {
2628 const { wallet } = useWallet();
2729 const point = need.point(pointCursor);
2830
31+ const { code, notice } = useKeyfileGenerator();
32+
2933 const {
3034 isParent,
3135 isActiveOwner,
@@ -109,6 +113,16 @@ export default function Point() {
109113 Admin
110114 </Grid.Item>
111115 <Grid.Divider />
116+ <Grid.Item
117+ full
118+ as={ForwardButton}
119+ accessory={code && <CopyButton text={code} />}
120+ detail={code || notice}
121+ disabled={!code}
122+ detailClassName="mono">
123+ Login Code
124+ </Grid.Item>
125+ <Grid.Divider />
112126 {isParent && (
113127 <>
114128 <Grid.Item