mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-11-23 02:10:12 +01:00
31cf7c10a4
# Permission System 2.0 ## Background This PR migrates the extension permission system to [the new `PermissionController`](https://github.com/MetaMask/snaps-skunkworks/tree/main/packages/controllers/src/permissions). The original permission system, based on [`rpc-cap`](https://github.com/MetaMask/rpc-cap), introduced [`ZCAP-LD`](https://w3c-ccg.github.io/zcap-ld/)-like permissions to our JSON-RPC stack. We used it to [implement](https://github.com/MetaMask/metamask-extension/pull/7004) what we called "LoginPerSite" in [version 7.7.0](https://github.com/MetaMask/metamask-extension/releases/tag/v7.7.0) of the extension, which enabled the user to choose which accounts, if any, should be exposed to each dapp. While that was a worthwhile feature in and of itself, we wanted a permission _system_ in order to enable everything we are going to with Snaps. Unfortunately, the original permission system was difficult to use, and necessitated the creation of the original `PermissionsController` (note the "s"), which was more or less a wrapper for `rpc-cap`. With this PR, we shake off the yoke of the original permission system, in favor of the modular, self-contained, ergonomic, and more mature permission system 2.0. Note that [the `PermissionController` readme](https://github.com/MetaMask/snaps-skunkworks/tree/main/packages/controllers/src/permissions/README.md) explains how the new permission system works. The `PermissionController` and `SubjectMetadataController` are currently shipped via `@metamask/snap-controllers`. This is a temporary state of affairs, and we'll move them to `@metamask/controllers` once they've landed in prod. ## Changes in Detail First, the changes in this PR are not as big as they seem. Roughly half of the additions in this PR are fixtures in the test for the new migration (number 68), and a significant portion of the remaining ~2500 lines are due to find-and-replace changes in other test fixtures and UI files. - The extension `PermissionsController` has been deleted, and completely replaced with the new `PermissionController` from [`@metamask/snap-controllers`](https://www.npmjs.com/package/@metamask/snap-controllers). - The original `PermissionsController` "domain metadata" functionality is now managed by the new `SubjectMetadataController`, also from [`@metamask/snap-controllers`](https://www.npmjs.com/package/@metamask/snap-controllers). - The permission activity and history log controller has been renamed `PermissionLogController` and has its own top-level state key, but is otherwise functionally equivalent to the existing implementation. - Migration number 68 has been added to account for the new state changes. - The tests in `app/scripts/controllers/permissions` have been migrated from `mocha` to `jest`. Reviewers should focus their attention on the following files: - `app/scripts/` - `metamask-controller.js` - This is where most of the integration work for the new `PermissionController` occurs. Some functions that were internal to the original controller were moved here. - `controllers/permissions/` - `selectors.js` - These selectors are for `ControllerMessenger` selector subscriptions. The actual subscriptions occur in `metamask-controller.js`. See the `ControllerMessenger` implementation for details. - `specifications.js` - The caveat and permission specifications are required by the new `PermissionController`, and are used to specify the `eth_accounts` permission and its JSON-RPC method implementation. See the `PermissionController` readme for details. - `migrations/068.js` - The new state should be cross-referenced with the controllers that manage it. The accompanying tests should also be thoroughly reviewed. Some files may appear new but have just moved and/or been renamed: - `app/scripts/lib/rpc-method-middleware/handlers/request-accounts.js` - This was previously implemented in `controllers/permissions/permissionsMethodMiddleware.js`. - `test/mocks/permissions.js` - A truncated version of `test/mocks/permission-controller.js`. Co-authored-by: Mark Stacey <markjstacey@gmail.com>
117 lines
3.7 KiB
JavaScript
117 lines
3.7 KiB
JavaScript
import { cloneDeep } from 'lodash';
|
|
import { getChangedAccounts, getPermittedAccountsByOrigin } from './selectors';
|
|
|
|
describe('PermissionController selectors', () => {
|
|
describe('getChangedAccounts', () => {
|
|
it('returns the new value if the previous value is undefined', () => {
|
|
const newAccounts = new Map([['foo.bar', ['0x1']]]);
|
|
expect(getChangedAccounts(newAccounts)).toBe(newAccounts);
|
|
});
|
|
|
|
it('returns an empty map if the new and previous values are the same', () => {
|
|
const newAccounts = new Map([['foo.bar', ['0x1']]]);
|
|
expect(getChangedAccounts(newAccounts, newAccounts)).toStrictEqual(
|
|
new Map(),
|
|
);
|
|
});
|
|
|
|
it('returns a new map of the changed accounts if the new and previous values differ', () => {
|
|
// We set this on the new and previous value under the key 'foo.bar' to
|
|
// check that identical values are excluded.
|
|
const identicalValue = ['0x1'];
|
|
|
|
const previousAccounts = new Map([
|
|
['bar.baz', ['0x1']], // included: different accounts
|
|
['fizz.buzz', ['0x1']], // included: removed in new value
|
|
]);
|
|
previousAccounts.set('foo.bar', identicalValue);
|
|
|
|
const newAccounts = new Map([
|
|
['bar.baz', ['0x1', '0x2']], // included: different accounts
|
|
['baz.fizz', ['0x3']], // included: brand new
|
|
]);
|
|
newAccounts.set('foo.bar', identicalValue);
|
|
|
|
expect(getChangedAccounts(newAccounts, previousAccounts)).toStrictEqual(
|
|
new Map([
|
|
['bar.baz', ['0x1', '0x2']],
|
|
['fizz.buzz', []],
|
|
['baz.fizz', ['0x3']],
|
|
]),
|
|
);
|
|
});
|
|
});
|
|
|
|
describe('getPermittedAccountsByOrigin', () => {
|
|
it('memoizes and gets permitted accounts by origin', () => {
|
|
const state1 = {
|
|
subjects: {
|
|
'foo.bar': {
|
|
origin: 'foo.bar',
|
|
permissions: {
|
|
eth_accounts: {
|
|
caveats: [{ type: 'restrictReturnedAccounts', value: ['0x1'] }],
|
|
},
|
|
},
|
|
},
|
|
'bar.baz': {
|
|
origin: 'bar.baz',
|
|
permissions: {
|
|
eth_accounts: {
|
|
caveats: [{ type: 'restrictReturnedAccounts', value: ['0x2'] }],
|
|
},
|
|
},
|
|
},
|
|
'baz.bizz': {
|
|
origin: 'baz.fizz',
|
|
permissions: {
|
|
eth_accounts: {
|
|
caveats: [
|
|
{ type: 'restrictReturnedAccounts', value: ['0x1', '0x2'] },
|
|
],
|
|
},
|
|
},
|
|
},
|
|
'no.accounts': {
|
|
// we shouldn't see this in the result
|
|
permissions: {
|
|
foobar: {},
|
|
},
|
|
},
|
|
},
|
|
};
|
|
|
|
const expected1 = new Map([
|
|
['foo.bar', ['0x1']],
|
|
['bar.baz', ['0x2']],
|
|
['baz.fizz', ['0x1', '0x2']],
|
|
]);
|
|
|
|
const selected1 = getPermittedAccountsByOrigin(state1);
|
|
|
|
expect(selected1).toStrictEqual(expected1);
|
|
// The selector should return the memoized value if state.subjects is
|
|
// the same object
|
|
expect(selected1).toBe(getPermittedAccountsByOrigin(state1));
|
|
|
|
// If we mutate the state, the selector return value should be different
|
|
// from the first.
|
|
const state2 = cloneDeep(state1);
|
|
delete state2.subjects['foo.bar'];
|
|
|
|
const expected2 = new Map([
|
|
['bar.baz', ['0x2']],
|
|
['baz.fizz', ['0x1', '0x2']],
|
|
]);
|
|
|
|
const selected2 = getPermittedAccountsByOrigin(state2);
|
|
|
|
expect(selected2).toStrictEqual(expected2);
|
|
expect(selected2).not.toBe(selected1);
|
|
// Since we didn't mutate the state at this point, the value should once
|
|
// again be the memoized.
|
|
expect(selected2).toBe(getPermittedAccountsByOrigin(state2));
|
|
});
|
|
});
|
|
});
|