Skip to content

Commit

Permalink
Fix CVE-2015-8857 and CVE-2015-8858
Browse files Browse the repository at this point in the history 
by switching to a version of `tokml` that is being (somewhat?) maintained.
mapbox/tokml#31 (comment)
  • Loading branch information
@gabrieldeal
gabrieldeal committed Jan 27, 2020
1 parent 4001ee6 commit 92d802e
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 153 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"react-leaflet": "^2.6.1",
"recompose": "^0.30.0",
"togpx": "^0.5.4",
"tokml": "^0.4.0",
"@maphubs/tokml": "^0.5.0",
"turf-reverse": "^1.0.0",
"uuid": "^3.4.0",
"xlsx": "^0.15.4"
Expand Down
2 changes: 1 addition & 1 deletion src/lib/convertFromGeoJson.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import togpx from 'togpx';
import tokml from 'tokml';
import tokml from '@maphubs/tokml';

export function toGpx(origGeoJson) {
// Filter out folders:
Expand Down
177 changes: 26 additions & 151 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,16 @@
minimist "1.2.0"
xmldom "~0.1.19"

"@maphubs/tokml@^0.5.0":
version "0.5.2"
resolved "https://registry.yarnpkg.com/@maphubs/tokml/-/tokml-0.5.2.tgz#cef1491aee5402607c6dd5e205ecbba156d76c75"
integrity sha512-UZKR5aC3oSkWBlWV26DOgVHNX8/bTWt8Taug3rpzmGM9rmBj112ucTufkVAyBmoMFKVY6xPO0kvxYTUKLFO/iQ==
dependencies:
minimist "^1.2.0"
rw "^1.3.3"
strxml mapbox/strxml
xml-escape "^1.1.0"

"@material-ui/core@^3.9.3":
version "3.9.4"
resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-3.9.4.tgz#5297fd4ad9e739a87da4a6d34fc4af5396886e13"
Expand Down Expand Up @@ -1348,11 +1358,6 @@
resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==

abbrev@1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==

accepts@^1.3.7, accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
version "1.3.7"
resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
Expand Down Expand Up @@ -2164,11 +2169,6 @@ buffer-alloc@^1.1.0, buffer-alloc@^1.2.0:
buffer-alloc-unsafe "^1.1.0"
buffer-fill "^1.0.0"

buffer-equal@~0.0.0:
version "0.0.2"
resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.2.tgz#ecbb790f568d40098a6242b54805c75805eb938f"
integrity sha1-7Lt5D1aNQAmKYkK1SAXHWAXrk48=

buffer-fill@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
Expand Down Expand Up @@ -2208,21 +2208,6 @@ builtin-status-codes@^3.0.0:
resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=

[email protected]:
version "0.1.2"
resolved "https://registry.yarnpkg.com/bunker/-/bunker-0.1.2.tgz#c88992464a8e2a6ede86930375f92b58077ef97c"
integrity sha1-yImSRkqOKm7ehpMDdfkrWAd++Xw=
dependencies:
burrito ">=0.2.5 <0.3"

"burrito@>=0.2.5 <0.3":
version "0.2.12"
resolved "https://registry.yarnpkg.com/burrito/-/burrito-0.2.12.tgz#d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b"
integrity sha1-0NbmrIHV6ZeJxvpKzLCwAx6lT2s=
dependencies:
traverse "~0.5.1"
uglify-js "~1.1.1"

[email protected]:
version "3.0.0"
resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
Expand Down Expand Up @@ -2418,11 +2403,6 @@ charenc@~0.0.1:
resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=

[email protected]:
version "0.1.2"
resolved "https://registry.yarnpkg.com/charm/-/charm-0.1.2.tgz#06c21eed1a1b06aeb67553cdc53e23274bac2296"
integrity sha1-BsIe7RobBq62dVPNxT4jJ0usIpY=

[email protected]:
version "3.3.0"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.0.tgz#12c0714668c55800f659e262d4962a97faf554a6"
Expand Down Expand Up @@ -3388,17 +3368,12 @@ deep-equal@^1.0.1, deep-equal@^1.1.0:
object-keys "^1.1.1"
regexp.prototype.flags "^1.2.0"

deep-equal@~0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-0.0.0.tgz#99679d3bbd047156fcd450d3d01eeb9068691e83"
integrity sha1-mWedO70EcVb81FDT0B7rkGhpHoM=

deep-extend@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==

deep-is@0.1.x, deep-is@~0.1.3:
deep-is@~0.1.3:
version "0.1.3"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
Expand Down Expand Up @@ -3557,15 +3532,6 @@ diffie-hellman@^5.0.0:
miller-rabin "^4.0.0"
randombytes "^2.0.0"

difflet@~0.2.0:
version "0.2.6"
resolved "https://registry.yarnpkg.com/difflet/-/difflet-0.2.6.tgz#ab23b31f5649b6faa8e3d2acbd334467365ca6fa"
integrity sha1-qyOzH1ZJtvqo49KsvTNEZzZcpvo=
dependencies:
charm "0.1.x"
deep-is "0.1.x"
traverse "0.6.x"

dir-glob@^3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
Expand Down Expand Up @@ -5098,14 +5064,6 @@ glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
once "^1.3.0"
path-is-absolute "^1.0.0"

glob@~3.2.1:
version "3.2.11"
resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
integrity sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=
dependencies:
inherits "2"
minimatch "0.3"

global-dirs@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
Expand Down Expand Up @@ -5714,7 +5672,7 @@ inflight@^1.0.4:
once "^1.3.0"
wrappy "1"

inherits@*, inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
version "2.0.4"
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
Expand Down Expand Up @@ -6892,11 +6850,6 @@ lowercase-keys@^2.0.0:
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==

lru-cache@2:
version "2.7.3"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
integrity sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=

[email protected]:
version "4.0.0"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.0.tgz#b5cbf01556c16966febe54ceec0fb4dc90df6c28"
Expand Down Expand Up @@ -7172,14 +7125,6 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=

[email protected]:
version "0.3.0"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
integrity sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=
dependencies:
lru-cache "2"
sigmund "~1.0.0"

[email protected]:
version "3.0.3"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
Expand All @@ -7199,11 +7144,6 @@ [email protected]:
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=

[email protected]:
version "0.1.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de"
integrity sha1-md9lelJXTCHJBXSX33QnkLK0wN4=

[email protected], minimist@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
Expand Down Expand Up @@ -7243,7 +7183,7 @@ mixin-deep@^1.2.0:
for-in "^1.0.2"
is-extendable "^1.0.1"

[email protected], mkdirp@^0.5.1, "mkdirp@~0.3 || 0.4 || 0.5", mkdirp@~0.5.1:
[email protected], mkdirp@^0.5.1, mkdirp@~0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
Expand Down Expand Up @@ -7436,13 +7376,6 @@ [email protected]:
inherits "^2.0.1"
readable-stream "~1.0.31"

nopt@~2:
version "2.2.1"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-2.2.1.tgz#2aa09b7d1768487b3b89a9c5aa52335bff0baea7"
integrity sha1-KqCbfRdoSHs7ianFqlIzW/8Lrqc=
dependencies:
abbrev "1"

normalize-package-data@^2.3.2:
version "2.5.0"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
Expand Down Expand Up @@ -9403,17 +9336,10 @@ run-queue@^1.0.0, run-queue@^1.0.3:
dependencies:
aproba "^1.1.1"

runforcover@~0.0.2:
version "0.0.2"
resolved "https://registry.yarnpkg.com/runforcover/-/runforcover-0.0.2.tgz#344f057d8d45d33aebc6cc82204678f69c4857cc"
integrity sha1-NE8FfY1F0zrrxsyCIEZ49pxIV8w=
dependencies:
bunker "0.1.X"

[email protected]:
version "0.0.4"
resolved "https://registry.yarnpkg.com/rw/-/rw-0.0.4.tgz#de27b1ed5b9175772eaa22a79662510bd0598c4c"
integrity sha1-3iex7VuRdXcuqiKnlmJRC9BZjEw=
rw@^1.3.3:
version "1.3.3"
resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=

rx-lite-aggregates@^4.0.8:
version "4.0.8"
Expand Down Expand Up @@ -9669,11 +9595,6 @@ sift@^5.1.0:
resolved "https://registry.yarnpkg.com/sift/-/sift-5.1.0.tgz#1bbf2dfb0eb71e56c4cc7fb567fbd1351b65015e"
integrity sha1-G78t+w63HlbEzH+1Z/vRNRtlAV4=

sigmund@~1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
integrity sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=

signal-exit@^3.0.0, signal-exit@^3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
Expand Down Expand Up @@ -9714,11 +9635,6 @@ slice-ansi@^3.0.0:
astral-regex "^2.0.0"
is-fullwidth-code-point "^3.0.0"

slide@*:
version "1.1.6"
resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=

slugify@^1.3.6:
version "1.3.6"
resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.3.6.tgz#ba5fd6159b570fe4811d02ea9b1f4906677638c3"
Expand Down Expand Up @@ -10243,12 +10159,11 @@ strip-json-comments@~2.0.1:
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=

[email protected]:
version "0.0.0"
resolved "https://registry.yarnpkg.com/strxml/-/strxml-0.0.0.tgz#8ff5314c8c874db0550673761a81e4d3f244145c"
integrity sha1-j/UxTIyHTbBVBnN2GoHk0/JEFFw=
"strxml@github:mapbox/strxml":
version "1.0.0"
resolved "https://codeload.github.com/mapbox/strxml/tar.gz/4325a5597621600183b869452da6104f8d2215b8"
dependencies:
tap "~0.4.8"
xml-escape "1.1.0"

style-loader@^0.23.1:
version "0.23.1"
Expand Down Expand Up @@ -10327,22 +10242,6 @@ table@^5.2.3:
slice-ansi "^2.1.0"
string-width "^3.0.0"

tap@~0.4.8:
version "0.4.13"
resolved "https://registry.yarnpkg.com/tap/-/tap-0.4.13.tgz#3986134d6759727fc2223e61126eeb87243accbc"
integrity sha1-OYYTTWdZcn/CIj5hEm7rhyQ6zLw=
dependencies:
buffer-equal "~0.0.0"
deep-equal "~0.0.0"
difflet "~0.2.0"
glob "~3.2.1"
inherits "*"
mkdirp "~0.3 || 0.4 || 0.5"
nopt "~2"
runforcover "~0.0.2"
slide "*"
yamlish "*"

tapable@^1.0.0, tapable@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
Expand Down Expand Up @@ -10520,32 +10419,13 @@ [email protected]:
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==

tokml@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/tokml/-/tokml-0.4.0.tgz#7c0321b424663ca3187a0a419f2dfbcf90da372a"
integrity sha1-fAMhtCRmPKMYegpBny37z5DaNyo=
dependencies:
minimist "0.1.0"
rw "0.0.4"
strxml "0.0.0"

tr46@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
dependencies:
punycode "^2.1.0"

[email protected]:
version "0.6.6"
resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.6.6.tgz#cbdf560fd7b9af632502fed40f918c157ea97137"
integrity sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=

traverse@~0.5.1:
version "0.5.2"
resolved "https://registry.yarnpkg.com/traverse/-/traverse-0.5.2.tgz#e203c58d5f7f0e37db6e74c0acb929bb09b61d85"
integrity sha1-4gPFjV9/DjfbbnTArLkpuwm2HYU=

"true-case-path@^2.2.1":
version "2.2.1"
resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-2.2.1.tgz#c5bf04a5bbec3fd118be4084461b3a27c4d796bf"
Expand Down Expand Up @@ -10625,11 +10505,6 @@ ua-parser-js@^0.7.18:
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==

uglify-js@~1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-1.1.1.tgz#ee71a97c4cefd06a1a9b20437f34118982aa035b"
integrity sha1-7nGpfEzv0GoamyBDfzQRiYKqA1s=

ultron@~1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c"
Expand Down Expand Up @@ -11249,6 +11124,11 @@ xlsx@^0.15.4:
exit-on-epipe "~1.0.1"
ssf "~0.10.2"

[email protected], xml-escape@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/xml-escape/-/xml-escape-1.1.0.tgz#3904c143fa8eb3a0030ec646d2902a2f1b706c44"
integrity sha1-OQTBQ/qOs6ADDsZG0pAqLxtwbEQ=

xmldom@^0.1.21, xmldom@~0.1.17, xmldom@~0.1.19:
version "0.1.31"
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
Expand Down Expand Up @@ -11298,11 +11178,6 @@ yaml@^1.7.2:
dependencies:
"@babel/runtime" "^7.6.3"

yamlish@*:
version "0.0.7"
resolved "https://registry.yarnpkg.com/yamlish/-/yamlish-0.0.7.tgz#b4af9a1dcc63618873c3d6e451ec3213c39a57fb"
integrity sha1-tK+aHcxjYYhzw9bkUewyE8OaV/s=

yargs-parser@^11.1.1:
version "11.1.1"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
Expand Down

0 comments on commit 92d802e

Please sign in to comment.