Skip to content

Commit 3354bc1

Browse files
authored
Fix security issues + update some Mozilla references (#962)
1 parent 8464741 commit 3354bc1

File tree

7 files changed

+184
-57
lines changed

7 files changed

+184
-57
lines changed

Extension/webext-instrumentation/package-lock.json

Lines changed: 95 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Extension/webext-instrumentation/package.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"main": "build/main/index.js",
77
"typings": "build/main/index.d.ts",
88
"module": "build/module/index.js",
9-
"repository": "https://github.com/mozilla/OpenWPM",
10-
"homepage": "https://github.com/mozilla/OpenWPM/tree/master/Extension/webext-instrumentation",
9+
"repository": "https://github.com/openwpm/OpenWPM",
10+
"homepage": "https://github.com/openwpm/OpenWPM/tree/master/Extension/webext-instrumentation",
1111
"keywords": [],
1212
"scripts": {
1313
"info": "npm-scripts-info",
@@ -36,6 +36,7 @@
3636
"reset": "git clean -dfx && git reset --hard && npm i",
3737
"clean": "trash build test",
3838
"all": "run-s reset test cov:check doc:html",
39+
"preinstall": "npx npm-force-resolutions",
3940
"prepare": "run-s build test",
4041
"prepare-release": "run-s all version doc:publish",
4142
"publish-please": "publish-please",
@@ -82,6 +83,9 @@
8283
"typedoc": "^0.21.9",
8384
"typescript": "^4.5.2"
8485
},
86+
"resolutions": {
87+
"lodash": "^4.17.21"
88+
},
8589
"ava": {
8690
"failFast": true,
8791
"files": [

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
OpenWPM:
2-
Copyright © 2015 Steven Englehardt
2+
Copyright © 2021 Steven Englehardt
33
Licensed GPL v3
44

55
CONTRIBUTORS AGREE TO FREE/OPEN SOURCE LICENSING

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ that this repo builds, which is also based on Ubuntu. Although we don't official
4242
other platforms, conda is a cross platform utility and the install script can be expected
4343
to work on OSX and other linux distributions.
4444

45-
OpenWPM does not support windows: https://github.com/mozilla/OpenWPM/issues/503
45+
OpenWPM does not support windows: https://github.com/openwpm/OpenWPM/issues/503
4646

4747

4848
### Pre-requisites
@@ -144,7 +144,7 @@ Troubleshooting
144144
try re-running the file with the environment variable
145145
`PYTHONNOUSERSITE` set. E.g., `PYTHONNOUSERSITE=True python demo.py`.
146146
If that fixes your issues, you are experiencing
147-
[issue 689](https://github.com/mozilla/OpenWPM/issues/689), which can be
147+
[issue 689](https://github.com/openwpm/OpenWPM/issues/689), which can be
148148
fixed by clearing your
149149
python [user site packages directory](https://www.python.org/dev/peps/pep-0370/),
150150
by prepending `PYTHONNOUSERSITE=True` to a specific command, or by setting
@@ -165,7 +165,7 @@ Advice for Measurement Researchers
165165
OpenWPM is [often used](https://webtap.princeton.edu/software/) for web
166166
measurement research. We recommend the following for researchers using the tool:
167167

168-
**Use a versioned [release](https://github.com/mozilla/OpenWPM/releases).** We
168+
**Use a versioned [release](https://github.com/openwpm/OpenWPM/releases).** We
169169
aim to follow Firefox's release cadence, which is roughly once every four
170170
weeks. If we happen to fall behind on checking in new releases, please file an
171171
issue. Versions more than a few months out of date will use unsupported
@@ -202,7 +202,7 @@ For each of the data classes we offer a variety of storage providers, and you ar
202202
to implement your own, should the provided backends not be enough for you.
203203
204204
We have an outstanding issue to enable saving content generated by commands, such as
205-
screenshots and page dumps to unstructured storage (see [#232](https://github.com/mozilla/OpenWPM/issues/232)).
205+
screenshots and page dumps to unstructured storage (see [#232](https://github.com/openwpm/OpenWPM/issues/232)).
206206
For now, they get saved to `manager_params.data_directory`.
207207
208208
### Local Storage
@@ -226,7 +226,7 @@ For storing unstructured data locally we also offer two solutions:
226226
### Remote storage
227227

228228
When running in the cloud, saving records to disk is not a reasonable thing to do.
229-
So we offer a remote StorageProviders for S3 (See [#823](https://github.com/mozilla/OpenWPM/issues/823)) and GCP.
229+
So we offer a remote StorageProviders for S3 (See [#823](https://github.com/openwpm/OpenWPM/issues/823)) and GCP.
230230
Currently, all remote StorageProviders write to the respective object storage service (S3/GCS).
231231
The structured providers use the Parquet format.
232232

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
# -- Project information -----------------------------------------------------
2525

2626
project = "OpenWPM"
27-
copyright = "2020, Mozilla"
28-
author = "Mozilla"
27+
copyright = "2021, OpenWPM"
28+
author = "OpenWPM Contributors"
2929

3030

3131
# -- General configuration ---------------------------------------------------

0 commit comments

Comments
 (0)