Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

fix: limit SW registration to content root #2682

Merged
merged 2 commits into from
Feb 3, 2020
Merged

fix: limit SW registration to content root #2682

merged 2 commits into from
Feb 3, 2020

Conversation

lidel
Copy link
Member

@lidel lidel commented Dec 17, 2019 •
edited
Loading

This PR introduces hardening proposed in ipfs/kubo#4025 (comment)

go-ipfs version: ipfs/kubo#6801

@lidel lidel requested a review from alanshaw December 17, 2019 01:27
@lidel lidel mentioned this pull request Dec 17, 2019
Merged
@alanshaw
Copy link
Member

@lidel any chance you can look into why linting is failing?

@lidel
Copy link
Member Author

lidel commented Dec 17, 2019 •
edited
Loading

@alanshaw @hugomrdias aegir was missing from PATH, not sure why:
master build works fine, same with other branch builds from yesterday.
Clearing caches did not help, perhaps a Travis issue?

Anyway, switched .travis.yml to calling linting via npx aegir lint (97dceb7) and the "check" stage is now green.

@lidel
Copy link
Member Author

lidel commented Dec 17, 2019

CI fails due to unrelated test ("add recursively")

@alanshaw
Copy link
Member

alanshaw commented Dec 30, 2019 •
edited
Loading

Yes, it looks like something changed in it-glob and it's not globbing empty directories...either that or the test data has been wrong for a long time! TBH it looks like the latter 😱

@achingbrain any ideas?

@lidel lidel force-pushed the fix/service-worker-per-root branch from 97dceb7 to 7b492d2 Compare February 1, 2020 01:03
@lidel
Copy link
Member Author

lidel commented Feb 1, 2020 •
edited
Loading

(rebased on latest master)
We really should ship this fix with 0.41 (cc #2656)

Update: CI hang in "queue" state for over 10h, button for restarting was not available, looks like a TravisCI bug. As a workaround I force-push with a commit message changed to trigger a new run.

@lidel lidel force-pushed the fix/service-worker-per-root branch from 7b492d2 to c611f0d Compare February 1, 2020 11:09
@lidel
Copy link
Member Author

lidel commented Feb 1, 2020 •
edited
Loading

@hugomrdias CI failed because js-ipfsd-ctl#feat/force-kill branch disappeared. I switched to ipfsd-ctl v2.1.0 but CI now fails with:

     Error: Cannot find module 'go-ipfs-dep/go-ipfs/ipfs'
      at Function.Module._resolveFilename (internal/modules/cjs/loader.js:636:15)
      at resolveFileName (node_modules/resolve-from/index.js:29:39)
      at resolveFrom (node_modules/resolve-from/index.js:43:9)
      at module.exports (node_modules/resolve-from/index.js:46:47)
      at module.exports.moduleId (node_modules/ipfsd-ctl/node_modules/resolve-cwd/index.js:4:30)

(https://travis-ci.com/ipfs/js-ipfs/jobs/282596829#L1085)

Is there a fix or should we just park this PR until master is green again?

@alanshaw
Copy link
Member

alanshaw commented Feb 1, 2020

When #2729 is merged (hopefully really soon) you should be able to pick this up again. We really should get this in 0.41.

@alanshaw alanshaw mentioned this pull request Feb 1, 2020
Closed
57 tasks
@lidel
fix: limit SW registration to content root
fa82593 
Introduces hardening proposed in:
ipfs/kubo#4025 (comment)

License: MIT
Signed-off-by: Marcin Rataj <[email protected]>
@lidel
fix(ci): aegir: not found
b4e2c91 
For some reason non-master/release branch build failed to find aegir on PATH.
This uses npx to ensure it always works

License: MIT
Signed-off-by: Marcin Rataj <[email protected]>
@alanshaw
Copy link
Member

alanshaw commented Feb 3, 2020

@lidel I've rebased this

@alanshaw alanshaw merged commit feba661 into master Feb 3, 2020
@alanshaw alanshaw deleted the fix/service-worker-per-root branch February 3, 2020 17:08
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@alanshaw alanshaw alanshaw approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lidel @alanshaw