Skip to content
This repository has been archived by the owner on Jun 16, 2020. It is now read-only.

IPFS Integration #1

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

IPFS Integration #1

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a6d660c
feat: mix in IPFS
daviddias Aug 22, 2017
3e82c59
feat: update ipfs to latest, add script to fetch it
daviddias Aug 22, 2017
08b4f38
it loads an IPFS node!
daviddias Aug 22, 2017
4d2b5cc
rm useIPFS from internationalization messages (not used anywhere)
daviddias Aug 28, 2017
4ca81cf
add new ipfs 0.25.2
daviddias Aug 28, 2017
e248f2d
IPFS background page
daviddias Aug 28, 2017
faa9afe
feat: make it work with a background page instead
daviddias Aug 28, 2017
3952beb
rm csp from ipfs ext
daviddias Sep 1, 2017
f2a0df9
add csp back again
daviddias Sep 1, 2017
ca10910
identify next steps, wait for node to be ready, remove WebRTC while b…
daviddias Sep 1, 2017
bc43e50
only use unsafe-eval where it needs to be explicitely applied
daviddias Sep 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ Brave.tar.bz2
app/extensions/gen
app/extensions/brave/gen
app/extensions/torrent/gen
app/extensions/ipfs/gen

*.pfx
buildConfig.js

Expand Down
24 changes: 18 additions & 6 deletions app/extensions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,13 +415,17 @@ module.exports.init = () => {
return object
}

let loadExtension = (extensionId, extensionPath, manifest = {}, manifestLocation = 'unpacked') => {
if (extensionId === config.PDFJSExtensionId) {
const loadExtension = (extensionId, extensionPath, manifest = {}, manifestLocation = 'unpacked') => {
if (extensionId === config.PDFJSExtensionId ||
extensionId === config.ipfsExtensionId) {
manifestLocation = 'component'
}
if (!extensionInfo.isLoaded(extensionId) && !extensionInfo.isLoading(extensionId)) {
if (!extensionInfo.isLoaded(extensionId) &&
!extensionInfo.isLoading(extensionId)) {
extensionInfo.setState(extensionId, extensionStates.LOADING)
if (extensionId === config.braveExtensionId || extensionId === config.torrentExtensionId || extensionId === config.syncExtensionId) {
if (extensionId === config.braveExtensionId ||
extensionId === config.torrentExtensionId ||
extensionId === config.syncExtensionId) {
session.defaultSession.extensions.load(extensionPath, manifest, manifestLocation)
return
}
Expand All @@ -430,6 +434,7 @@ module.exports.init = () => {
// just a safety net.
fs.exists(path.join(extensionPath, 'manifest.json'), (exists) => {
if (exists) {
console.log('Loading:', extensionId, manifestLocation)
session.defaultSession.extensions.load(extensionPath, manifest, manifestLocation)
} else {
// This is an error condition, but we can recover.
Expand All @@ -454,18 +459,21 @@ module.exports.init = () => {
const extensions = extensionState.getExtensions(appStore.getState())
const extensionPath = extensions.getIn([extensionId, 'filePath'])
if (extensionPath) {
// Otheriwse just install it
// Otherwise just install it
loadExtension(extensionId, extensionPath)
}
}
}

// Manually install the braveExtension and torrentExtension
// Manually install the braveExtension, torrentExtension and ipfsExtension

// braveExtension
extensionInfo.setState(config.braveExtensionId, extensionStates.REGISTERED)
loadExtension(config.braveExtensionId, getExtensionsPath('brave'), generateBraveManifest(), 'component')
extensionInfo.setState(config.syncExtensionId, extensionStates.REGISTERED)
loadExtension(config.syncExtensionId, getExtensionsPath('brave'), generateSyncManifest(), 'unpacked')

// torrentExtension
if (getSetting(settings.TORRENT_VIEWER_ENABLED)) {
extensionInfo.setState(config.torrentExtensionId, extensionStates.REGISTERED)
loadExtension(config.torrentExtensionId, getExtensionsPath('torrent'), generateTorrentManifest(), 'component')
Expand All @@ -474,6 +482,10 @@ module.exports.init = () => {
extensionActions.extensionDisabled(config.torrentExtensionId)
}

// ipfsExtension
extensionInfo.setState(config.ipfsExtensionId, extensionStates.REGISTERED)
loadExtension(config.ipfsExtensionId, getExtensionsPath('ipfs'))

let registerComponents = (diff) => {
if (getSetting(settings.PDFJS_ENABLED)) {
registerComponent(config.PDFJSExtensionId, config.PDFJSExtensionPublicKey)
Expand Down
2 changes: 1 addition & 1 deletion app/extensions/brave/index-dev.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- TODO: Don't allow img-src *, needed for favicons -->
<!-- TODO: Refactor away all unsafe-inline content -->
<!-- TODO: Replace suggestqueries.google.com and ac.duckduckgo.com and other search engines with a single config search engine -->
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; form-action http://localhost:*; script-src 'self' http://localhost:*; connect-src 'self' https://s3.amazonaws.com/adblock-data/ https://s3.amazonaws.com/safe-browsing-data/ https://s3.amazonaws.com/tracking-protection-data/ https://s3.amazonaws.com/https-everywhere-data/ http://localhost:* ws://localhost:* https://suggestqueries.google.com https://ac.duckduckgo.com https://completion.amazon.com https://search.yahoo.com https://api.bing.com https://www.startpage.com https://infogalactic.com https://api.qwant.com https://ac.ecosia.org https://searx.me https://www.findx.com https://brave-download.global.ssl.fastly.net https://brave-laptop-updates.global.ssl.fastly.net https://brave-download.global.ssl.fastly.net https://laptop-updates-pre.brave.com https://brave-laptop-updates-pre.brave.com; style-src 'unsafe-inline'; font-src 'self' http://localhost:*; img-src 'self' * data: file: chrome-extension:; object-src 'self'; plugin-types application/browser-plugin">
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; form-action http://localhost:*; script-src 'self' 'unsafe-eval' http://localhost:*; connect-src 'self' https://s3.amazonaws.com/adblock-data/ https://s3.amazonaws.com/safe-browsing-data/ https://s3.amazonaws.com/tracking-protection-data/ https://s3.amazonaws.com/https-everywhere-data/ http://localhost:* ws://localhost:* https://suggestqueries.google.com https://ac.duckduckgo.com https://completion.amazon.com https://search.yahoo.com https://api.bing.com https://www.startpage.com https://infogalactic.com https://api.qwant.com https://ac.ecosia.org https://searx.me https://www.findx.com https://brave-download.global.ssl.fastly.net https://brave-laptop-updates.global.ssl.fastly.net https://brave-download.global.ssl.fastly.net https://laptop-updates-pre.brave.com https://brave-laptop-updates-pre.brave.com; style-src 'unsafe-inline'; font-src 'self' http://localhost:*; img-src 'self' * data: file: chrome-extension:; object-src 'self'; plugin-types application/browser-plugin">
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added the 'unsafe-eval'

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is that needed? I think @diracdeltas will likely have an issue with it

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately unsafe-eval removes most of the purpose of having a CSP - please avoid it by refactoring all inline script code into external files.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed it from here. It was not necessary

<meta name="referrer" content="no-referrer">
<title>Brave</title>
<script src="ext/l20n.min.js"></script>
Expand Down
1 change: 1 addition & 0 deletions app/extensions/brave/locales/bn-BD/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this is no longer necessary as the preference pane doesn't show this message anymore.

1 change: 1 addition & 0 deletions app/extensions/brave/locales/bn-IN/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/cs/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Dlouhý
normal=Normal
short=Krátký
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/de-DE/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/en-US/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/es/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/eu/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/fr-FR/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/hi-IN/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/id-ID/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Waktunya menunggu sebelum meninjau tab baru
long=Panjang
normal=Normal
short=Pendek
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/it-IT/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/ja-JP/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=長い
normal=Normal
short=短い
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/ko-KR/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/ms-MY/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Tempoh menunggu sebelum previu tab
long=Panjang
normal=Normal
short=Pendek
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/nl-NL/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Lang
normal=Normal
short=Kort
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/pl-PL/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/pt-BR/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/ru/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Время ожидания перед просмотром в
long=Длинное
normal=Normal
short=Короткое
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/sl/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Dolga
normal=Normal
short=Kratka
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/ta/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/te/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/tr-TR/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/uk/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/brave/locales/zh-CN/preferences.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,3 +384,4 @@ tabPreviewTiming=Time to wait before previewing a tab
long=Long
normal=Normal
short=Short
useIPFS=Enable IPFS (requires browser restart)
1 change: 1 addition & 0 deletions app/extensions/ipfs/_locales/en/app.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ipfs=Distributed Web
1 change: 1 addition & 0 deletions app/extensions/ipfs/_locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
3 changes: 3 additions & 0 deletions app/extensions/ipfs/ext/l20n.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added app/extensions/ipfs/img/favicon.ico
View file
Open in desktop
Binary file not shown.
Binary file added app/extensions/ipfs/img/ipfs-128.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/extensions/ipfs/img/ipfs-16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/extensions/ipfs/img/ipfs-48.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/extensions/ipfs/img/ipfs.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
227 changes: 227 additions & 0 deletions app/extensions/ipfs/js/ipfs.min.js
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions app/extensions/ipfs/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/* global Ipfs */

// const ipc = window.chrome.ipcRenderer

chrome.protocol.registerStringProtocol('ipfs', handler)
chrome.protocol.registerStringProtocol('dweb', handler)

function handler (request, callback) {
// test to check if handling the protocol works
// callback('hi there!' + test()) // eslint-disable-line

const node = new Ipfs()

node.on('ready', () => {
node.files.cat('QmSmuETUoXzh4Qo5upHxJWZJK8AEpXXZdTqs34ttE3qMYn', (err, stream) => {
if (err) {
return callback('failed to get the hash')
}
let buf = ''
stream.on('data', (data) => {
buf += data.toString()
})
stream.on('end', () => {
callback(buf)
})
})
// callback('I am online!') // eslint-disable-line
})

// test loading Ipfs into the background process scope
// callback('hi there!' + test() + Ipfs.toString()) // eslint-disable-line
}
3 changes: 3 additions & 0 deletions app/extensions/ipfs/js/some-other.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
function test () {
return 'yeeah'
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was a test to make sure I could in fact run a function from another file.

22 changes: 22 additions & 0 deletions app/extensions/ipfs/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"manifest_version": 2,
"name": "IPFS",
"version": "0.1.0",
"default_locale": "en",
"description": "InterPlanetary FileSystem",
"icons": {
"128": "img/ipfs-128.png",
"48": "img/ipfs-48.png",
"16": "img/ipfs-16.png"
},
"offline_enabled": true,
"background": {
"scripts": [
"js/some-other.js",
"js/ipfs.min.js",
"js/main.js"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To test with IPFS, add here js/ipfs.min.js

],
"persistent": true
},
"content_security_policy": "script-src 'self' 'unsafe-eval'"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe the csp you have defined in the page above can be defined here instead

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if the CSP is just for the IPFS extension, it should be defined here instead of in index-dev.html. i would still encourage refactoring such that unsafe-eval isn't needed.

Copy link
Collaborator Author

@daviddias daviddias Sep 1, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bridiver when an extension has an index.html page, the extension loader ignores this CSP and applies the one in index.html. So yes, you are right, the index.html one is the only one necessary. My test yielded a false positive, it actually needs to have this in the manifest too.

@diracdeltas agreed that we should not have the need for unsafe-eval. We are working on it :)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@diasdavid I think the latest version of js-ipfs-api is ready to be tested without evals :)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we just use js-ipfs. It seems that there still something. Need to test this more:

image

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is definitely still a protobuf thing

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like we missed two modules

npm ls protocol-buffers
ipfs@0.25.4 /Users/dignifiedquire/opensource/ipfs/js-ipfs
├─┬ libp2p-floodsub@0.11.0
│ └─┬ libp2p-crypto@0.9.4
│   └── protocol-buffers@3.2.1  deduped
└─┬ libp2p-kad-dht@0.5.0
  └── protocol-buffers@3.2.1

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 So it is evident. Nice, I was worried that it was npm false deduping. Thanks for catching that!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

Woot 🚀 No more unsafe-eval!

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉 🎉 🎉

}
1 change: 1 addition & 0 deletions docs/state.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ AppStore
'advanced.send-usage-statistics': boolean, // true or undefined if usage reports should be sent
'advanced.smooth-scroll-enabled': boolean, // false if smooth scrolling should be explicitly disabled
'advanced.torrent-viewer-enabled': boolean, // whether to render magnet links in the browser
'advanced.ipfs-enabled': boolean, // whether to use IPFS to render ipfs:// or dweb: links in the browser
'bookmarks.toolbar.show': boolean, // true if the bookmakrs toolbar should be shown
'bookmarks.toolbar.showFavicon': boolean, // true if bookmark favicons should be shown on the bookmarks toolbar
'bookmarks.toolbar.showOnlyFavicon': boolean, // true if only favicons should be shown on the bookmarks toolbar
Expand Down
1 change: 1 addition & 0 deletions js/about/preferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,7 @@ class AboutPreferences extends React.Component {
settings.LANGUAGE,
settings.PDFJS_ENABLED,
settings.TORRENT_VIEWER_ENABLED,
settings.IPFS_ENABLED,
settings.SMOOTH_SCROLL_ENABLED,
settings.SEND_CRASH_REPORTS,
settings.UPDATE_TO_PREVIEW_RELEASES
Expand Down
7 changes: 6 additions & 1 deletion js/constants/appConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ module.exports = {
COOKIEBLOCK: 'cookieblock', // block 3p cookies and referer
COOKIEBLOCK_ALL: 'cookieblockAll', // block all cookies and referer
SITEHACK: 'siteHacks',
WEBTORRENT: 'webtorrent'
WEBTORRENT: 'webtorrent',
IPFS: 'ipfs'
// ... other optional resource files are identified by uuid such as for regional adblock
},
cookieblock: {
Expand Down Expand Up @@ -95,6 +96,9 @@ module.exports = {
webtorrent: {
enabled: true
},
ipfs: {
enabled: true
},
adInsertion: {
enabled: false,
url: adHost
Expand Down Expand Up @@ -207,6 +211,7 @@ module.exports = {
'advanced.default-zoom-level': null,
'advanced.pdfjs-enabled': true,
'advanced.torrent-viewer-enabled': true,
'advanced.ipfs-enabled': true,
'advanced.smooth-scroll-enabled': false,
'advanced.send-crash-reports': true,
'advanced.send-usage-statistics': false,
Expand Down
1 change: 1 addition & 0 deletions js/constants/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ module.exports = {
widevineComponentPublicKey: 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmhe+02cLPPAViaevk/fzODKUnb/ysaAeD8lpE9pwirV6GYOm+naTo7xPOCh8ujcR6Ryi1nPTq2GTG0CyqdDyOsZ1aRLuMZ5QqX3dJ9jXklS0LqGfosoIpGexfwggbiLvQOo9Q+IWTrAO620KAzYU0U6MV272TJLSmZPUEFY6IGQIDAQAB',
braveExtensionId: 'mnojpmjdmbbfmejpflffifhffcmidifd',
torrentExtensionId: 'fmdpfempfmekjkcfdehndghogpnpjeno',
ipfsExtensionId: 'interplanetaryfilesystemuniverse',
syncExtensionId: 'cjnmeadmgmiihncdidmfiabhenbggfjm',
// PDFJS
// Parent repo: https://github.com/diracdeltas/pdf.js
Expand Down
1 change: 1 addition & 0 deletions js/constants/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const settings = {
HARDWARE_ACCELERATION_ENABLED: 'advanced.hardware-acceleration-enabled',
PDFJS_ENABLED: 'advanced.pdfjs-enabled',
TORRENT_VIEWER_ENABLED: 'advanced.torrent-viewer-enabled',
IPFS_ENABLED: 'advanced.ipfs-enabled',
DEFAULT_ZOOM_LEVEL: 'advanced.default-zoom-level',
SMOOTH_SCROLL_ENABLED: 'advanced.smooth-scroll-enabled',
SEND_CRASH_REPORTS: 'advanced.send-crash-reports',
Expand Down
53 changes: 53 additions & 0 deletions js/lib/appUrlUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@ module.exports.getTorrentExtUrl = function (relativeUrl) {
return 'chrome-extension://' + config.torrentExtensionId + '/' + relativeUrl
}

/**
* Gets the URL of a page hosted by the ipfsExtension
* Returns 'chrome-extension://<...>'
*/
module.exports.getIpfsExtUrl = function (relativeUrl) {
if (relativeUrl === undefined) {
relativeUrl = ''
}

return 'chrome-extension://' + config.ipfsExtensionId + '/' + relativeUrl
}

module.exports.getExtensionsPath = function (extensionDir) {
return (process.env.NODE_ENV !== 'development' && process.env.NODE_ENV !== 'test')
// the path is different for release builds because extensions are not in the asar file
Expand Down Expand Up @@ -210,6 +222,47 @@ module.exports.isTargetMagnetUrl = function (input) {
return !!module.exports.getSourceMagnetUrl(input)
}

/**
* Obtains the target URL associated with a IPFS path
* Returns null if the input is not a IPFS path
* Example: getTargetIpfsPath('ipfs:/...') -> 'chrome-extension://<...>.html#/ipfs/...'
*/
module.exports.getTargetIpfsPath = function (input) {
if (!input.startsWith('ipfs://') &&
!input.startsWith('dweb:')) {
return null
}
const url = module.exports.getIpfsExtUrl('ipfs.html')
return [url, input].join('#')
}

/**
* Obtains the source IPFS Path associated with a target URL
* Returns null if the input is not the local URL for a IPFS Path
* Example: getSourceIPFSPath('chrome-extension://<...>.html#/ipfs/...') -> 'ipfs:/:...'
*/
module.exports.getSourceIPFSPath = function (input) {
if (getBaseUrl(input) !== module.exports.getIpfsExtUrl('ipfs.html')) return null
const url = decodeURIComponent(getHash(input))
return url
}

/**
* Checks if the input looks like a magnet: URL
* Example: isSourceIpfsPath('ipfs:/..') -> true
*/
module.exports.isSourceIpfsPath = function (input) {
return !!module.exports.getTargetIpfsPath(input)
}

/*
* Checks if the input looks like the local URL for a IPFS Path
* Example: isSourceIpfsPath('chrome-extension://<...>.html#/ipfs/') -> true
*/
module.exports.isTargetIPFSPath = function (input) {
return !!module.exports.getSourceIPFSPath(input)
}

/**
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be no longer necessary as we now capture the ipfs:// protocol to load the extension and not redirect certain urls to the IPFS app as before.

* Determines whether a string is a valid URL. Based on node-urlutil.js.
* @param {string} input
Expand Down
Loading