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

Merge pull request #45 from sharelatex/bg-update-request

update request module
Brian Gough 7 лет назад
Родитель
Сommit
2828cc3d7f
2 измененных файлов с 51 добавлено и 103 удалено
  1. 50 102
      services/real-time/npm-shrinkwrap.json
  2. 1 1
      services/real-time/package.json

+ 50 - 102
services/real-time/npm-shrinkwrap.json

@@ -203,17 +203,10 @@
       "from": "arrify@>=1.0.1 <2.0.0",
       "from": "arrify@>=1.0.1 <2.0.0",
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
     },
     },
-    "asn1": {
-      "version": "0.1.11",
-      "from": "asn1@0.1.11",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
-      "optional": true
-    },
     "assert-plus": {
     "assert-plus": {
-      "version": "0.1.5",
-      "from": "assert-plus@>=0.1.5 <0.2.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
-      "optional": true
+      "version": "1.0.0",
+      "from": "assert-plus@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
     },
     },
     "assertion-error": {
     "assertion-error": {
       "version": "1.0.0",
       "version": "1.0.0",
@@ -237,10 +230,9 @@
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
     },
     },
     "aws-sign2": {
     "aws-sign2": {
-      "version": "0.5.0",
-      "from": "aws-sign2@>=0.5.0 <0.6.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
-      "optional": true
+      "version": "0.7.0",
+      "from": "aws-sign2@>=0.7.0 <0.8.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"
     },
     },
     "aws4": {
     "aws4": {
       "version": "1.8.0",
       "version": "1.8.0",
@@ -303,11 +295,6 @@
       "from": "body-parser@>=1.12.0 <2.0.0",
       "from": "body-parser@>=1.12.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz"
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz"
     },
     },
-    "boom": {
-      "version": "0.4.2",
-      "from": "boom@>=0.4.0 <0.5.0",
-      "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"
-    },
     "brace-expansion": {
     "brace-expansion": {
       "version": "1.1.11",
       "version": "1.1.11",
       "from": "brace-expansion@^1.1.7",
       "from": "brace-expansion@^1.1.7",
@@ -374,10 +361,9 @@
       "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"
       "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.4.tgz"
     },
     },
     "combined-stream": {
     "combined-stream": {
-      "version": "0.0.7",
-      "from": "combined-stream@>=0.0.4 <0.1.0",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
-      "optional": true
+      "version": "1.0.7",
+      "from": "combined-stream@>=1.0.6 <1.1.0",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz"
     },
     },
     "concat-map": {
     "concat-map": {
       "version": "0.0.1",
       "version": "0.0.1",
@@ -441,18 +427,6 @@
       "from": "crc@3.4.4",
       "from": "crc@3.4.4",
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"
       "resolved": "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"
     },
     },
-    "cryptiles": {
-      "version": "0.2.2",
-      "from": "cryptiles@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
-      "optional": true
-    },
-    "ctype": {
-      "version": "0.5.3",
-      "from": "ctype@0.5.3",
-      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
-      "optional": true
-    },
     "dashdash": {
     "dashdash": {
       "version": "1.14.1",
       "version": "1.14.1",
       "from": "dashdash@>=1.12.0 <2.0.0",
       "from": "dashdash@>=1.12.0 <2.0.0",
@@ -482,10 +456,9 @@
       "resolved": "https://registry.npmjs.org/delay/-/delay-4.1.0.tgz"
       "resolved": "https://registry.npmjs.org/delay/-/delay-4.1.0.tgz"
     },
     },
     "delayed-stream": {
     "delayed-stream": {
-      "version": "0.0.5",
-      "from": "delayed-stream@0.0.5",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
-      "optional": true
+      "version": "1.0.0",
+      "from": "delayed-stream@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
     },
     },
     "denque": {
     "denque": {
       "version": "1.4.1",
       "version": "1.4.1",
@@ -701,23 +674,14 @@
       }
       }
     },
     },
     "forever-agent": {
     "forever-agent": {
-      "version": "0.5.2",
-      "from": "forever-agent@>=0.5.0 <0.6.0",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"
+      "version": "0.6.1",
+      "from": "forever-agent@>=0.6.1 <0.7.0",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
     },
     },
     "form-data": {
     "form-data": {
-      "version": "0.1.4",
-      "from": "form-data@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
-      "optional": true,
-      "dependencies": {
-        "mime": {
-          "version": "1.2.11",
-          "from": "mime@>=1.2.11 <1.3.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
-          "optional": true
-        }
-      }
+      "version": "2.3.3",
+      "from": "form-data@>=2.3.2 <2.4.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"
     },
     },
     "forwarded": {
     "forwarded": {
       "version": "0.1.2",
       "version": "0.1.2",
@@ -802,12 +766,6 @@
       "from": "har-validator@>=5.1.0 <5.2.0",
       "from": "har-validator@>=5.1.0 <5.2.0",
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"
       "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz"
     },
     },
-    "hawk": {
-      "version": "1.0.0",
-      "from": "hawk@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz",
-      "optional": true
-    },
     "he": {
     "he": {
       "version": "1.1.1",
       "version": "1.1.1",
       "from": "he@1.1.1",
       "from": "he@1.1.1",
@@ -819,21 +777,15 @@
       "from": "hex2dec@>=1.0.1 <2.0.0",
       "from": "hex2dec@>=1.0.1 <2.0.0",
       "resolved": "https://registry.npmjs.org/hex2dec/-/hex2dec-1.1.2.tgz"
       "resolved": "https://registry.npmjs.org/hex2dec/-/hex2dec-1.1.2.tgz"
     },
     },
-    "hoek": {
-      "version": "0.9.1",
-      "from": "hoek@>=0.9.0 <0.10.0",
-      "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"
-    },
     "http-errors": {
     "http-errors": {
       "version": "1.6.3",
       "version": "1.6.3",
       "from": "http-errors@>=1.6.3 <1.7.0",
       "from": "http-errors@>=1.6.3 <1.7.0",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"
     },
     },
     "http-signature": {
     "http-signature": {
-      "version": "0.10.1",
-      "from": "http-signature@>=0.10.0 <0.11.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
-      "optional": true
+      "version": "1.2.0",
+      "from": "http-signature@>=1.2.0 <1.3.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"
     },
     },
     "https-proxy-agent": {
     "https-proxy-agent": {
       "version": "2.2.1",
       "version": "2.2.1",
@@ -1260,10 +1212,9 @@
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz"
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.6.tgz"
     },
     },
     "oauth-sign": {
     "oauth-sign": {
-      "version": "0.3.0",
-      "from": "oauth-sign@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz",
-      "optional": true
+      "version": "0.9.0",
+      "from": "oauth-sign@>=0.9.0 <0.10.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"
     },
     },
     "on-finished": {
     "on-finished": {
       "version": "2.3.0",
       "version": "2.3.0",
@@ -1465,24 +1416,29 @@
       }
       }
     },
     },
     "request": {
     "request": {
-      "version": "2.34.0",
-      "from": "request@>=2.34.0 <2.35.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.34.0.tgz",
+      "version": "2.88.0",
+      "from": "request@2.88.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
       "dependencies": {
       "dependencies": {
-        "mime": {
-          "version": "1.2.11",
-          "from": "mime@>=1.2.9 <1.3.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
+        "mime-db": {
+          "version": "1.38.0",
+          "from": "mime-db@>=1.38.0 <1.39.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz"
         },
         },
-        "node-uuid": {
-          "version": "1.4.8",
-          "from": "node-uuid@>=1.4.0 <1.5.0",
-          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"
+        "mime-types": {
+          "version": "2.1.22",
+          "from": "mime-types@>=2.1.19 <2.2.0",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz"
         },
         },
-        "qs": {
-          "version": "0.6.6",
-          "from": "qs@>=0.6.0 <0.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz"
+        "safe-buffer": {
+          "version": "5.1.2",
+          "from": "safe-buffer@>=5.1.2 <6.0.0",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
+        },
+        "uuid": {
+          "version": "3.3.2",
+          "from": "uuid@>=3.3.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"
         }
         }
       }
       }
     },
     },
@@ -1603,12 +1559,6 @@
       "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.5.2.tgz",
       "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.5.2.tgz",
       "dev": true
       "dev": true
     },
     },
-    "sntp": {
-      "version": "0.2.4",
-      "from": "sntp@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
-      "optional": true
-    },
     "socket.io": {
     "socket.io": {
       "version": "0.9.16",
       "version": "0.9.16",
       "from": "socket.io@0.9.16",
       "from": "socket.io@0.9.16",
@@ -1733,16 +1683,14 @@
       "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"
       "resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"
     },
     },
     "tough-cookie": {
     "tough-cookie": {
-      "version": "2.3.4",
-      "from": "tough-cookie@>=0.12.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
-      "optional": true
+      "version": "2.4.3",
+      "from": "tough-cookie@>=2.4.3 <2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz"
     },
     },
     "tunnel-agent": {
     "tunnel-agent": {
-      "version": "0.3.0",
-      "from": "tunnel-agent@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz",
-      "optional": true
+      "version": "0.6.0",
+      "from": "tunnel-agent@>=0.6.0 <0.7.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
     },
     },
     "tweetnacl": {
     "tweetnacl": {
       "version": "0.14.5",
       "version": "0.14.5",

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

@@ -31,7 +31,7 @@
     "logger-sharelatex": "^1.6.0",
     "logger-sharelatex": "^1.6.0",
     "metrics-sharelatex": "^2.1.1",
     "metrics-sharelatex": "^2.1.1",
     "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.6",
     "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.6",
-    "request": "~2.34.0",
+    "request": "^2.88.0",
     "session.socket.io": "^0.1.6",
     "session.socket.io": "^0.1.6",
     "settings-sharelatex": "^1.1.0",
     "settings-sharelatex": "^1.1.0",
     "socket.io": "0.9.16",
     "socket.io": "0.9.16",