Просмотр исходного кода

Merge pull request #173 from overleaf/jpa-harden-cleanup

[misc] bump socket.io and socket.io-client: harden cleanup
Jakob Ackermann 6 лет назад
Родитель
Сommit
cc5d908efb
2 измененных файлов с 22 добавлено и 22 удалено
  1. 20 20
      services/real-time/package-lock.json
  2. 2 2
      services/real-time/package.json

+ 20 - 20
services/real-time/package-lock.json

@@ -449,7 +449,7 @@
     "active-x-obfuscator": {
     "active-x-obfuscator": {
       "version": "0.0.1",
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz",
       "resolved": "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz",
-      "integrity": "sha512-8gdEZinfLSCfAUulETDth4ZSIDPSchiPgm5PLrXQC6BANf1YFEDrPPM2MdK2zcekMROwtM667QFuYw/H6ZV06Q==",
+      "integrity": "sha1-CJuJs3FF/x2ex0r2UwvlUmyuHxo=",
       "requires": {
       "requires": {
         "zeparser": "0.0.5"
         "zeparser": "0.0.5"
       }
       }
@@ -863,6 +863,11 @@
         "delayed-stream": "~1.0.0"
         "delayed-stream": "~1.0.0"
       }
       }
     },
     },
+    "commander": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz",
+      "integrity": "sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E="
+    },
     "common-tags": {
     "common-tags": {
       "version": "1.8.0",
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz",
       "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.0.tgz",
@@ -3128,7 +3133,7 @@
     "options": {
     "options": {
       "version": "0.0.6",
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
       "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz",
-      "integrity": "sha512-bOj3L1ypm++N+n7CEbbe473A414AB7z+amKYshRb//iuL3MpdDCLhPnw6aVTdKB9g5ZRVHIEp8eUln6L2NUStg=="
+      "integrity": "sha1-7CLTEoBrtT5zF3Pnza788cZDEo8="
     },
     },
     "os-tmpdir": {
     "os-tmpdir": {
       "version": "1.0.2",
       "version": "1.0.2",
@@ -3280,7 +3285,7 @@
     "policyfile": {
     "policyfile": {
       "version": "0.0.4",
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz",
       "resolved": "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz",
-      "integrity": "sha512-UfDtlscNialXfmVEwEPm0t/5qtM0xPK025eYWd/ilv89hxLIhVQmt3QIzMHincLO2MBtZyww0386pt13J4aIhQ=="
+      "integrity": "sha1-1rgurZiueeviKOLa9ZAzEeyYLk0="
     },
     },
     "prelude-ls": {
     "prelude-ls": {
       "version": "1.1.2",
       "version": "1.1.2",
@@ -4532,26 +4537,26 @@
       }
       }
     },
     },
     "socket.io": {
     "socket.io": {
-      "version": "https://github.com/overleaf/socket.io/archive/0.9.19-overleaf-2.tar.gz",
-      "integrity": "sha512-BVxF8Wz4FTj2hxiBtujKQUAihdVzxjSaJ++k/wr7pJfAt30kmyOXLkfyvFDzZISQ9SyDa2B4nBYJP3+MKBpaAg==",
+      "version": "https://github.com/overleaf/socket.io/archive/0.9.19-overleaf-3.tar.gz",
+      "integrity": "sha512-x07f3i4f3/CXaTBpUT/mH4JtYf3xjZWO0tvIB43Nn8OnzeRhMaKxhMZWcLQxfPdcaAyvafwLeM06fiDpHCaIYw==",
       "requires": {
       "requires": {
         "base64id": "0.1.0",
         "base64id": "0.1.0",
         "policyfile": "0.0.4",
         "policyfile": "0.0.4",
         "redis": "0.7.3",
         "redis": "0.7.3",
-        "socket.io-client": "https://github.com/overleaf/socket.io-client/archive/0.9.17-overleaf-1.tar.gz"
+        "socket.io-client": "https://github.com/overleaf/socket.io-client/archive/0.9.17-overleaf-2.tar.gz"
       },
       },
       "dependencies": {
       "dependencies": {
         "redis": {
         "redis": {
           "version": "0.7.3",
           "version": "0.7.3",
           "resolved": "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz",
           "resolved": "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz",
-          "integrity": "sha512-0Pgb0jOLfn6eREtEIRn/ifyZJjl2H+wUY4F/Pe7T4UhmoSrZ/1HU5ZqiBpDk8I8Wbyv2N5DpXKzbEtMj3drprg==",
+          "integrity": "sha1-7le3pE0l7BWU5ENl2BZfp9HUgRo=",
           "optional": true
           "optional": true
         }
         }
       }
       }
     },
     },
     "socket.io-client": {
     "socket.io-client": {
-      "version": "https://github.com/overleaf/socket.io-client/archive/0.9.17-overleaf-1.tar.gz",
-      "integrity": "sha512-MchfS0GCu0BVbJXRk+HfHme5jHPWMDrNifbOhXZHJBtF03dLfCJcMPLYMQBtBGWQrrZsqXI0O9P3BO3hu0cPLA==",
+      "version": "https://github.com/overleaf/socket.io-client/archive/0.9.17-overleaf-2.tar.gz",
+      "integrity": "sha512-u8jEVctc4nFrN1JfjLeFjSSxXxGYo6hHxYW4rhv6aeoiaWkTmdaUzaG1YkDfSwBG/TXmdHx32UJB4fClmz8IEg==",
       "requires": {
       "requires": {
         "active-x-obfuscator": "0.0.1",
         "active-x-obfuscator": "0.0.1",
         "uglify-js": "1.2.5",
         "uglify-js": "1.2.5",
@@ -4835,7 +4840,7 @@
     "tinycolor": {
     "tinycolor": {
       "version": "0.0.1",
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz",
       "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz",
-      "integrity": "sha512-+CorETse1kl98xg0WAzii8DTT4ABF4R3nquhrkIbVGcw1T8JYs5Gfx9xEfGINPUZGDj9C4BmOtuKeaTtuuRolg=="
+      "integrity": "sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ="
     },
     },
     "tmp": {
     "tmp": {
       "version": "0.0.33",
       "version": "0.0.33",
@@ -4960,7 +4965,7 @@
     "uglify-js": {
     "uglify-js": {
       "version": "1.2.5",
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz",
-      "integrity": "sha512-Ps1oQryKOcRDYuAN1tGpPWd/DIRMcdLz4p7JMxLjJiFvp+aaG01IEu0ZSoVvYUSxIkvW7k2X50BCW2InguEGlg=="
+      "integrity": "sha1-tULCx29477NLIAsgF3Y0Mw/3ArY="
     },
     },
     "uid-safe": {
     "uid-safe": {
       "version": "2.1.5",
       "version": "2.1.5",
@@ -5182,7 +5187,7 @@
     "ws": {
     "ws": {
       "version": "0.4.32",
       "version": "0.4.32",
       "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz",
       "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz",
-      "integrity": "sha512-htqsS0U9Z9lb3ITjidQkRvkLdVhQePrMeu475yEfOWkAYvJ6dSjQp1tOH6ugaddzX5b7sQjMPNtY71eTzrV/kA==",
+      "integrity": "sha1-eHphVEFPPJntg8V3IVOyD+sM7DI=",
       "requires": {
       "requires": {
         "commander": "~2.1.0",
         "commander": "~2.1.0",
         "nan": "~1.0.0",
         "nan": "~1.0.0",
@@ -5190,22 +5195,17 @@
         "tinycolor": "0.x"
         "tinycolor": "0.x"
       },
       },
       "dependencies": {
       "dependencies": {
-        "commander": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz",
-          "integrity": "sha512-J2wnb6TKniXNOtoHS8TSrG9IOQluPrsmyAJ8oCUJOBmv+uLBCyPYAZkD2jFvw2DCzIXNnISIM01NIvr35TkBMQ=="
-        },
         "nan": {
         "nan": {
           "version": "1.0.0",
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz",
           "resolved": "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz",
-          "integrity": "sha512-Wm2/nFOm2y9HtJfgOLnctGbfvF23FcQZeyUZqDD8JQG3zO5kXh3MkQKiUaA68mJiVWrOzLFkAV1u6bC8P52DJA=="
+          "integrity": "sha1-riT4hQgY1mL8q1rPfzuVv6oszzg="
         }
         }
       }
       }
     },
     },
     "xmlhttprequest": {
     "xmlhttprequest": {
       "version": "1.4.2",
       "version": "1.4.2",
       "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz",
       "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz",
-      "integrity": "sha512-WTsthd44hTdCRrHkdtTgbgTKIJyNDV+xiShdooFZBUstY7xk+EXMx/u5gjuUXaCiCWvtBVCHwauzml2joevB4w=="
+      "integrity": "sha1-AUU6HZvtHo8XL2SVu/TIxCYyFQA="
     },
     },
     "y18n": {
     "y18n": {
       "version": "4.0.0",
       "version": "4.0.0",
@@ -5307,7 +5307,7 @@
     "zeparser": {
     "zeparser": {
       "version": "0.0.5",
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz",
       "resolved": "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz",
-      "integrity": "sha512-Qj4lJIRPy7hIW1zCBqwA3AW8F9uHswVoXPnotuY6uyNgbg5qGb6SJfWZi+YzD3DktbUnUoGiGZFhopbn9l1GYw=="
+      "integrity": "sha1-A3JlYbwmjy5URPVMZlt/1KjAKeI="
     }
     }
   }
   }
 }
 }

+ 2 - 2
services/real-time/package.json

@@ -32,8 +32,8 @@
     "redis-sharelatex": "^1.0.13",
     "redis-sharelatex": "^1.0.13",
     "request": "^2.88.2",
     "request": "^2.88.2",
     "settings-sharelatex": "^1.1.0",
     "settings-sharelatex": "^1.1.0",
-    "socket.io": "https://github.com/overleaf/socket.io/archive/0.9.19-overleaf-2.tar.gz",
-    "socket.io-client": "https://github.com/overleaf/socket.io-client/archive/0.9.17-overleaf-1.tar.gz"
+    "socket.io": "https://github.com/overleaf/socket.io/archive/0.9.19-overleaf-3.tar.gz",
+    "socket.io-client": "https://github.com/overleaf/socket.io-client/archive/0.9.17-overleaf-2.tar.gz"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "bunyan": "~0.22.3",
     "bunyan": "~0.22.3",