+
${navItem({
text: browser.i18n.getMessage('panel_quickImport'),
style: 'b',
diff --git a/add-on/src/popup/page-action/page.js b/add-on/src/popup/page-action/page.js
index 1b672e143..4c668dae2 100644
--- a/add-on/src/popup/page-action/page.js
+++ b/add-on/src/popup/page-action/page.js
@@ -13,9 +13,9 @@ module.exports = function pageActionPage (state, emit) {
const onCopy = (copyAction) => emit('copy', copyAction)
const onPin = () => emit('pin')
const onUnPin = () => emit('unPin')
- const onToggleSiteRedirect = () => emit('toggleSiteRedirect')
+ const onToggleSiteIntegrations = () => emit('toggleSiteIntegrations')
- const contextActionsProps = Object.assign({ onViewOnGateway, onCopy, onPin, onUnPin, onToggleSiteRedirect }, state)
+ const contextActionsProps = Object.assign({ onViewOnGateway, onCopy, onPin, onUnPin, onToggleSiteIntegrations }, state)
// Instant init: page-action is shown only in ipfsContext
contextActionsProps.isIpfsContext = true
diff --git a/test/functional/lib/ipfs-proxy/enable-command.test.js b/test/functional/lib/ipfs-proxy/enable-command.test.js
index 9ac50241a..76137e336 100644
--- a/test/functional/lib/ipfs-proxy/enable-command.test.js
+++ b/test/functional/lib/ipfs-proxy/enable-command.test.js
@@ -10,6 +10,8 @@ const Sinon = require('sinon')
const AccessControl = require('../../../../add-on/src/lib/ipfs-proxy/access-control')
const createEnableCommand = require('../../../../add-on/src/lib/ipfs-proxy/enable-command')
const createRequestAccess = require('../../../../add-on/src/lib/ipfs-proxy/request-access')
+const { initState } = require('../../../../add-on/src/lib/state')
+const { optionDefaults } = require('../../../../add-on/src/lib/options')
describe('lib/ipfs-proxy/enable-command', () => {
before(() => {
@@ -18,7 +20,32 @@ describe('lib/ipfs-proxy/enable-command', () => {
})
it('should throw if proxy access is disabled globally', async () => {
- const getState = () => ({ ipfsProxy: false })
+ const getState = () => initState(optionDefaults, { ipfsProxy: false })
+ const accessControl = new AccessControl(new Storage())
+ const getScope = () => 'https://1.foo.tld/path/'
+ const getIpfs = () => {}
+ const requestAccess = createRequestAccess(browser, screen)
+ const enable = createEnableCommand(getIpfs, getState, getScope, accessControl, requestAccess)
+ const permissions = { commands: ['files.mkdir', 'id', 'version'] }
+
+ let error
+
+ try {
+ await enable(permissions)
+ } catch (err) {
+ error = err
+ }
+
+ expect(() => { if (error) throw error }).to.throw('User disabled access to API proxy in IPFS Companion')
+ expect(error.scope).to.equal(undefined)
+ expect(error.permissions).to.be.equal(undefined)
+ })
+
+ it('should throw if ALL IPFS integrations are disabled for requested scope', async () => {
+ const getState = () => initState(optionDefaults, {
+ ipfsProxy: true,
+ noIntegrationsHostnames: ['foo.tld']
+ })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://1.foo.tld/path/'
const getIpfs = () => {}
@@ -40,7 +67,7 @@ describe('lib/ipfs-proxy/enable-command', () => {
})
it('should throw if access to unknown command is requested', async () => {
- const getState = () => ({ ipfsProxy: true })
+ const getState = () => initState(optionDefaults, { ipfsProxy: true })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://2.foo.tld/path/'
const getIpfs = () => {}
@@ -59,7 +86,7 @@ describe('lib/ipfs-proxy/enable-command', () => {
})
it('should return without prompt if called without any arguments', async () => {
- const getState = () => ({ ipfsProxy: true })
+ const getState = () => initState(optionDefaults, { ipfsProxy: true })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://3.foo.tld/path/'
const getIpfs = () => {}
@@ -73,7 +100,7 @@ describe('lib/ipfs-proxy/enable-command', () => {
})
it('should request access if no grant exists', async () => {
- const getState = () => ({ ipfsProxy: true })
+ const getState = () => initState(optionDefaults, { ipfsProxy: true })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://4.foo.tld/path/'
const getIpfs = () => {}
@@ -89,7 +116,7 @@ describe('lib/ipfs-proxy/enable-command', () => {
})
it('should request access if partial grant exists', async () => {
- const getState = () => ({ ipfsProxy: true })
+ const getState = () => initState(optionDefaults, { ipfsProxy: true })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://4.foo.tld/path/'
const getIpfs = () => {}
@@ -110,7 +137,7 @@ describe('lib/ipfs-proxy/enable-command', () => {
})
it('should deny access if any partial deny already exists', async () => {
- const getState = () => ({ ipfsProxy: true })
+ const getState = () => initState(optionDefaults, { ipfsProxy: true })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://4.foo.tld/path/'
const getIpfs = () => {}
@@ -141,7 +168,7 @@ describe('lib/ipfs-proxy/enable-command', () => {
})
it('should deny access when user denies request', async () => {
- const getState = () => ({ ipfsProxy: true })
+ const getState = () => initState(optionDefaults, { ipfsProxy: true })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://5.foo.tld/path/'
const getIpfs = () => {}
@@ -162,7 +189,7 @@ describe('lib/ipfs-proxy/enable-command', () => {
})
it('should not re-request if denied', async () => {
- const getState = () => ({ ipfsProxy: true })
+ const getState = () => initState(optionDefaults, { ipfsProxy: true })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://6.foo.tld/path/'
const getIpfs = () => {}
@@ -195,7 +222,7 @@ describe('lib/ipfs-proxy/enable-command', () => {
})
it('should have a well-formed Error if denied', async () => {
- const getState = () => ({ ipfsProxy: true })
+ const getState = () => initState(optionDefaults, { ipfsProxy: true })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://7.foo.tld/path/'
const getIpfs = () => {}
@@ -222,7 +249,7 @@ describe('lib/ipfs-proxy/enable-command', () => {
})
it('should not re-request if allowed', async () => {
- const getState = () => ({ ipfsProxy: true })
+ const getState = () => initState(optionDefaults, { ipfsProxy: true })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://8.foo.tld/path/'
const getIpfs = () => {}
diff --git a/test/functional/lib/ipfs-proxy/pre-acl.test.js b/test/functional/lib/ipfs-proxy/pre-acl.test.js
index 658cb6e7b..c9134149f 100644
--- a/test/functional/lib/ipfs-proxy/pre-acl.test.js
+++ b/test/functional/lib/ipfs-proxy/pre-acl.test.js
@@ -6,6 +6,8 @@ const Storage = require('mem-storage-area/Storage')
const Sinon = require('sinon')
const AccessControl = require('../../../../add-on/src/lib/ipfs-proxy/access-control')
const { createPreAcl } = require('../../../../add-on/src/lib/ipfs-proxy/pre-acl')
+const { initState } = require('../../../../add-on/src/lib/state')
+const { optionDefaults } = require('../../../../add-on/src/lib/options')
describe('lib/ipfs-proxy/pre-acl', () => {
before(() => {
@@ -13,7 +15,7 @@ describe('lib/ipfs-proxy/pre-acl', () => {
})
it('should throw if access is disabled', async () => {
- const getState = () => ({ ipfsProxy: false })
+ const getState = () => initState(optionDefaults, { ipfsProxy: false })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://ipfs.io/'
const permission = 'files.add'
@@ -33,8 +35,32 @@ describe('lib/ipfs-proxy/pre-acl', () => {
expect(error.permissions).to.be.equal(undefined)
})
+ it('should throw if ALL IPFS integrations are disabled for requested scope', async () => {
+ const getState = () => initState(optionDefaults, {
+ ipfsProxy: true,
+ noIntegrationsHostnames: ['foo.tld']
+ })
+ const accessControl = new AccessControl(new Storage())
+ const getScope = () => 'https://2.foo.tld/bar/buzz/'
+ const permission = 'files.add'
+
+ const preAcl = createPreAcl(permission, getState, getScope, accessControl)
+
+ let error
+
+ try {
+ await preAcl()
+ } catch (err) {
+ error = err
+ }
+
+ expect(() => { if (error) throw error }).to.throw('User disabled access to API proxy in IPFS Companion')
+ expect(error.scope).to.equal(undefined)
+ expect(error.permissions).to.be.equal(undefined)
+ })
+
it('should request access if no grant exists', async () => {
- const getState = () => ({ ipfsProxy: true })
+ const getState = () => initState(optionDefaults, { ipfsProxy: true })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://ipfs.io/'
const permission = 'files.add'
@@ -47,7 +73,7 @@ describe('lib/ipfs-proxy/pre-acl', () => {
})
it('should deny access when user denies request', async () => {
- const getState = () => ({ ipfsProxy: true })
+ const getState = () => initState(optionDefaults, { ipfsProxy: true })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://ipfs.io/'
const permission = 'files.add'
@@ -67,7 +93,7 @@ describe('lib/ipfs-proxy/pre-acl', () => {
})
it('should not re-request if denied', async () => {
- const getState = () => ({ ipfsProxy: true })
+ const getState = () => initState(optionDefaults, { ipfsProxy: true })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://ipfs.io/'
const permission = 'files.add'
@@ -99,7 +125,7 @@ describe('lib/ipfs-proxy/pre-acl', () => {
})
it('should have a well-formed Error if denied', async () => {
- const getState = () => ({ ipfsProxy: true })
+ const getState = () => initState(optionDefaults, { ipfsProxy: true })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://ipfs.io/'
const permission = 'files.add'
@@ -124,7 +150,7 @@ describe('lib/ipfs-proxy/pre-acl', () => {
})
it('should not re-request if allowed', async () => {
- const getState = () => ({ ipfsProxy: true })
+ const getState = () => initState(optionDefaults, { ipfsProxy: true })
const accessControl = new AccessControl(new Storage())
const getScope = () => 'https://ipfs.io/'
const permission = 'files.add'
diff --git a/test/functional/lib/state.test.js b/test/functional/lib/state.test.js
new file mode 100644
index 000000000..dea2b55e0
--- /dev/null
+++ b/test/functional/lib/state.test.js
@@ -0,0 +1,42 @@
+'use strict'
+const { describe, it, beforeEach } = require('mocha')
+const { expect } = require('chai')
+const { URL } = require('url')
+const { initState } = require('../../../add-on/src/lib/state')
+const { optionDefaults } = require('../../../add-on/src/lib/options')
+
+describe('state.js', function () {
+ let state
+
+ beforeEach(function () {
+ global.URL = URL
+ state = Object.assign(initState(optionDefaults), { peerCount: 1 })
+ })
+
+ describe('activeIntegrations(url)', function () {
+ it('should return false if input is undefined', async function () {
+ expect(state.activeIntegrations(undefined)).to.equal(false)
+ })
+ it('should return true if host is not on the opt-out list', async function () {
+ state.noIntegrationsHostnames = ['pl.wikipedia.org']
+ const url = 'https://en.wikipedia.org/wiki/Main_Page'
+ expect(state.activeIntegrations(url)).to.equal(true)
+ })
+ it('should return false if host is not on the opt-out list but global toggle is off', async function () {
+ state.noIntegrationsHostnames = ['pl.wikipedia.org']
+ state.active = false
+ const url = 'https://en.wikipedia.org/wiki/Main_Page'
+ expect(state.activeIntegrations(url)).to.equal(false)
+ })
+ it('should return false if host is on the opt-out list', async function () {
+ state.noIntegrationsHostnames = ['example.com', 'pl.wikipedia.org']
+ const url = 'https://pl.wikipedia.org/wiki/Wikipedia:Strona_g%C5%82%C3%B3wna'
+ expect(state.activeIntegrations(url)).to.equal(false)
+ })
+ it('should return false if parent host of a subdomain is on the opt-out list', async function () {
+ state.noIntegrationsHostnames = ['wikipedia.org']
+ const url = 'https://pl.wikipedia.org/wiki/Wikipedia:Strona_g%C5%82%C3%B3wna'
+ expect(state.activeIntegrations(url)).to.equal(false)
+ })
+ })
+})