keybase-proofs 2.3.29 → 2.3.31

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.3.31 (2025-12-18)
+
+- Set response size limit when making a request in GenericWebSiteScraper.
+
+## 2.3.30 (2025-02-28)
+
+- Fix BaseScraper not properly handling promise rejections when fetching text
+  body.
+
 ## 2.3.29 (2024-07-22)
 
 - Fix Twitter scraper to handle empty result list case.

package/README.md

@@ -2,3 +2,5 @@ proofs
 ======
 
 Public Keybase Proof System
+
+Post issues to: https://github.com/keybase/keybase-issues

package/lib/constants.js

@@ -132,6 +132,7 @@
     },
     expire_in: 60 * 60 * 24 * 365 * 5,
     http_timeout: 15 * 1000,
+    generic_website_max_size: 128000,
     short_id_bytes: 27,
     shortest_pgp_signature: 100,
     critical_clock_skew_secs: 65 * 60,

package/lib/scrapers/base.js

@@ -96,7 +96,7 @@
             (function(__iced_k) {
               __iced_deferrals = new iced.Deferrals(__iced_k, {
                 parent: ___iced_passed_deferral,
-                filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/server_test_progs/proofs/src/scrapers/base.iced",
+                filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/base.iced",
                 funcname: "BaseScraper.validate"
               });
               _this.check_status(args, __iced_deferrals.defer({
@@ -171,7 +171,7 @@
         return (function(__iced_k) {
           __iced_deferrals = new iced.Deferrals(__iced_k, {
             parent: ___iced_passed_deferral,
-            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/server_test_progs/proofs/src/scrapers/base.iced",
+            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/base.iced",
             funcname: "BaseScraper._get_url_body"
           });
           _this.libs.fetch(opts.url, opts, __iced_deferrals.defer({
@@ -213,7 +213,7 @@
                   (function(__iced_k) {
                     __iced_deferrals = new iced.Deferrals(__iced_k, {
                       parent: ___iced_passed_deferral,
-                      filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/server_test_progs/proofs/src/scrapers/base.iced",
+                      filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/base.iced",
                       funcname: "BaseScraper._get_url_body"
                     });
                     f.call(response, __iced_deferrals.defer({
@@ -234,9 +234,30 @@
                     return __iced_k(cb(err, rc, body));
                   });
                 } else {
-                  return __iced_k(response.text().then(function(body) {
-                    return cb(err, rc, body);
-                  }));
+                  f = callbackify(response.text);
+                  (function(__iced_k) {
+                    __iced_deferrals = new iced.Deferrals(__iced_k, {
+                      parent: ___iced_passed_deferral,
+                      filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/base.iced",
+                      funcname: "BaseScraper._get_url_body"
+                    });
+                    f.call(response, __iced_deferrals.defer({
+                      assign_fn: (function() {
+                        return function() {
+                          err = arguments[0];
+                          return body = arguments[1];
+                        };
+                      })(),
+                      lineno: 129
+                    }));
+                    __iced_deferrals._fulfill();
+                  })(function() {
+                    if (err) {
+                      _this.log("| _get_url_body response.text() failed with: " + (err.toString()));
+                      rc = v_codes.CONTENT_FAILURE;
+                    }
+                    return __iced_k(cb(err, rc, body));
+                  });
                 }
               } catch (_error) {
                 err = _error;
@@ -279,11 +300,11 @@
         return (function(__iced_k) {
           __iced_deferrals = new iced.Deferrals(__iced_k, {
             parent: ___iced_passed_deferral,
-            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/server_test_progs/proofs/src/scrapers/base.iced",
+            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/base.iced",
             funcname: "BaseBearerToken.get"
           });
           _this._lock.acquire(__iced_deferrals.defer({
-            lineno: 160
+            lineno: 164
           }));
           __iced_deferrals._fulfill();
         });
@@ -315,7 +336,7 @@
               (function(__iced_k) {
                 __iced_deferrals = new iced.Deferrals(__iced_k, {
                   parent: ___iced_passed_deferral,
-                  filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/server_test_progs/proofs/src/scrapers/base.iced",
+                  filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/base.iced",
                   funcname: "BaseBearerToken.get"
                 });
                 _this.base._get_url_body(opts, __iced_deferrals.defer({
@@ -326,7 +347,7 @@
                       return body = arguments[2];
                     };
                   })(),
-                  lineno: 185
+                  lineno: 189
                 }));
                 __iced_deferrals._fulfill();
               })(function() {

package/lib/scrapers/generic_web_site.js

@@ -58,19 +58,21 @@
     };
 
     GenericWebSiteScraper.prototype._check_url = function(_arg, cb) {
-      var err, proof_text_check, raw, rc, url, ___iced_passed_deferral, __iced_deferrals, __iced_k;
+      var err, proof_text_check, raw, rc, size, url, ___iced_passed_deferral, __iced_deferrals, __iced_k;
       __iced_k = __iced_k_noop;
       ___iced_passed_deferral = iced.findDeferral(arguments);
       url = _arg.url, proof_text_check = _arg.proof_text_check;
+      size = constants.generic_website_max_size;
       (function(_this) {
         return (function(__iced_k) {
           __iced_deferrals = new iced.Deferrals(__iced_k, {
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/proofs/src/scrapers/generic_web_site.iced",
+            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/generic_web_site.iced",
             funcname: "GenericWebSiteScraper._check_url"
           });
           _this._get_url_body({
-            url: url
+            url: url,
+            size: size
           }, __iced_deferrals.defer({
             assign_fn: (function() {
               return function() {
@@ -79,7 +81,7 @@
                 return raw = arguments[2];
               };
             })(),
-            lineno: 48
+            lineno: 50
           }));
           __iced_deferrals._fulfill();
         });
@@ -132,7 +134,7 @@
                   (function(__iced_k) {
                     __iced_deferrals = new iced.Deferrals(__iced_k, {
                       parent: ___iced_passed_deferral,
-                      filename: "/Users/max/src/keybase/proofs/src/scrapers/generic_web_site.iced",
+                      filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/generic_web_site.iced",
                       funcname: "GenericWebSiteScraper.hunt2"
                     });
                     _this._check_url({
@@ -145,7 +147,7 @@
                           return rc = arguments[1];
                         };
                       })(),
-                      lineno: 66
+                      lineno: 68
                     }));
                     __iced_deferrals._fulfill();
                   })(function() {
@@ -215,7 +217,7 @@ _break()
         return (function(__iced_k) {
           __iced_deferrals = new iced.Deferrals(__iced_k, {
             parent: ___iced_passed_deferral,
-            filename: "/Users/max/src/keybase/proofs/src/scrapers/generic_web_site.iced",
+            filename: "/Users/michal/SourceCode/keybase/go/src/github.com/keybase/proofs/src/scrapers/generic_web_site.iced",
             funcname: "GenericWebSiteScraper.check_status"
           });
           _this._check_url({
@@ -228,7 +230,7 @@ _break()
                 return rc = arguments[1];
               };
             })(),
-            lineno: 95
+            lineno: 97
           }));
           __iced_deferrals._fulfill();
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keybase-proofs",
-  "version": "2.3.29",
+  "version": "2.3.31",
   "description": "Publicly-verifiable proofs of identity",
   "main": "lib/main.js",
   "scripts": {

package/src/constants.iced

@@ -115,8 +115,10 @@ exports.constants = constants =
     generic_web_site : 1000
     dns              : 1001
     pgp              : 1002
+
   expire_in : 60*60*24*365*5 # 5 years....
   http_timeout : 15*1000 # give up after 15 seconds....
+  generic_website_max_size : 128000 # do not download more than 128KB from generic websites
   short_id_bytes : 27
   shortest_pgp_signature : 100 # can't have a PGP signature shorter than this...
   critical_clock_skew_secs : 65*60 # if you clock is ~1 hour off, we won't accept the sig

package/src/scrapers/base.iced

@@ -126,8 +126,12 @@ class BaseScraper
             rc = v_codes.CONTENT_FAILURE
           cb err, rc, body
         else
-          response.text().then (body) ->
-            cb err, rc, body
+          f = callbackify response.text
+          await f.call response, defer err, body
+          if err
+            @log "| _get_url_body response.text() failed with: #{err.toString()}"
+            rc = v_codes.CONTENT_FAILURE
+          cb err, rc, body
       catch err
         cb err, rc, null
     else

package/src/scrapers/generic_web_site.iced

@@ -45,8 +45,10 @@ exports.GenericWebSiteScraper = class GenericWebSiteScraper extends BaseScraper
   # ---------------------------------------------------------------------------
 
   _check_url : ( { url, proof_text_check }, cb) ->
+    # limit how much data we want to receive from arbitrary websites
+    size = constants.generic_website_max_size
     # calls back with a v_code or null if it was ok
-    await @_get_url_body {url }, defer err, rc, raw
+    await @_get_url_body { url, size }, defer err, rc, raw
     rc = if rc isnt v_codes.OK                             then rc
     else if @_find_sig_in_raw(proof_text_check, raw)       then v_codes.OK
     else                                                   v_codes.NOT_FOUND

package/test/make_esc.iced

@@ -0,0 +1,48 @@
+C = require('iced-runtime').const
+
+exports.skip = true
+
+ipush = (e, msg) ->
+  if msg?
+    # Note: `e.istack = []` will be a noop if e is a primitive type
+    # like number or string. We have to check if `e.istack` exists
+    # before pushing so we don't crash.
+    e.istack = [] unless e.istack?
+    e.istack?.push msg
+
+copy_trace = (src, dst) ->
+  dst[C.trace] = src[C.trace]
+  dst
+
+# Error short-circuit connector with more verbose istack.
+
+# When resulting `esc` function is called, an istack entry will be constructed
+# based on iced trace object. This way istack will be populated by not only esc
+# identifiers (usually call site function names) but also filenames and line
+# numbers of call sites of individual esc() calls. If an error happens and
+# short-circuited back from deep in some test, it should be easier to identify
+# where exactly it originates from using the new istack.
+
+exports.make_esc = make_esc = (gcb, where) ->
+  # Create "global where" based on make_esc() call site.
+  where = make_esc.caller?.name unless where?
+  return (lcb) ->
+    # Create "local where" based on esc() call site. So every
+    # esc(defer(...)) will have its own istack entry, if iced
+    # trace object is available.
+    sb = [ where ]
+    if (tr = lcb[C.trace])
+      sb.push "Trace:"
+      sb.push tr[C.funcname]
+      sb.push "(#{tr[C.filename]}:#{tr[C.lineno] + 1})"
+    local_where = sb.filter((x) -> x).join(' ')
+    copy_trace lcb, (err, args...) ->
+      if not err? then lcb args...
+      else if not gcb.__esc
+        gcb.__esc = true
+        ipush err, local_where
+        gcb err
+
+exports.patch_make_esc = () ->
+  iced_error = require 'iced-error'
+  iced_error.make_esc = make_esc