Merge remote-tracking branch 'origin/master' into userns-dont-map-root

zenhack · Apr 3, 2022 · 6d4ed35 · 6d4ed35
2 parents 2bb450f + 6ac2383
commit 6d4ed35
Show file tree

Hide file tree

Showing 9 changed files with 922 additions and 840 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### v0.295 (2022-03-13) [bugfixes]
+- Updated dependencies. (No other changes.)
+
+### v0.294 (2022-02-12) [bugfixes]
+- Updated dependencies. (No other changes.)
+
 ### v0.293 (2022-01-16) [bugfixes]
 - Updated dependencies. (No other changes.)
 

diff --git a/deps/boringssl b/deps/boringssl
diff --git a/deps/capnproto b/deps/capnproto
diff --git a/deps/ekam b/deps/ekam
diff --git a/deps/libsodium b/deps/libsodium
diff --git a/shell/npm-shrinkwrap.json b/shell/npm-shrinkwrap.json
diff --git a/shell/package.json b/shell/package.json
@@ -14,7 +14,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime": "^7.16.7",
+    "@babel/runtime": "^7.17.2",
     "@root/acme": "^3.1.0",
     "@root/csr": "^0.8.1",
     "@root/keypairs": "^0.9.0",
@@ -37,21 +37,21 @@
     "acme-dns-01-vultr": "^3.0.2",
     "babel-runtime": "^6.26.0",
     "bignum": "^0.13.0",
-    "body-parser": "^1.19.1",
+    "body-parser": "^1.19.2",
     "content-type": "^1.0.4",
     "fibers": "^4.0.3",
     "heapdump": "^0.3.15",
     "intro.js": "git+https://github.com/sandstorm-io/intro.js.git#8e1c7604f251ec874bf4ae4d7b4f11a14cee697e",
     "ip": "^1.1.5",
     "ldapjs": "^1.0.2",
     "mailparser": "^0.6.2",
-    "meteor-node-stubs": "^1.1.0",
+    "meteor-node-stubs": "^1.2.0",
     "node-forge": "^1.2.1",
     "nodemailer": "^6.7.2",
     "nodemailer-smtp-pool": "^2.8.3",
     "openid-client": "^4.9.1",
     "smtp-server": "^1.17.0",
-    "stripe": "^8.197.0",
+    "stripe": "^8.209.0",
     "xml-crypto": "^2.1.3",
     "xml2js": "^0.2.8",
     "xmlbuilder": "^8.2.2",
@@ -60,8 +60,8 @@
   "devDependencies": {
     "@typescript-eslint/parser": "^3.10.1",
     "babel-eslint": "^10.1.0",
-    "chai": "^4.3.4",
+    "chai": "^4.3.6",
     "eslint": "^6.8.0",
-    "typescript": "^4.5.4"
+    "typescript": "^4.6.2"
   }
 }
diff --git a/src/sandstorm/run-bundle.c++ b/src/sandstorm/run-bundle.c++
@@ -2482,15 +2482,15 @@ private:
           headerTableBuilder.getFutureTable(), shellHttpAddr, clientSettings);
 
       GatewayService::Tables gatewayTables(headerTableBuilder);
+      kj::HttpHeaderId hXRealIp = headerTableBuilder.add("X-Real-Ip");
+      auto headerTable = headerTableBuilder.build();
+
       GatewayService service(io.provider->getTimer(), *shellHttp, kj::cp(router),
                              gatewayTables, config.rootUrl, config.wildcardHost,
                              config.termsPublicId.map(
                                  [](const kj::String& str) -> kj::StringPtr { return str; }),
                              config.allowLegacyRelaxedCSP);
 
-      kj::HttpHeaderId hXRealIp = headerTableBuilder.add("X-Real-Ip");
-
-      auto headerTable = headerTableBuilder.build();
       kj::HttpServer server(io.provider->getTimer(), *headerTable, [&](kj::AsyncIoStream& conn) {
         return kj::heap<RealIpService>(service, hXRealIp, conn);
       });

diff --git a/src/sandstorm/update-tool.c++ b/src/sandstorm/update-tool.c++
@@ -167,10 +167,15 @@ public:
     kj::FdOutputStream(raiiOpen(arg, O_WRONLY | O_APPEND | O_CREAT, 0600))
         .write(random, sizeof(random));
 
+    // Generate the key
+    byte publicKey[crypto_sign_ed25519_PUBLICKEYBYTES];
+    byte secretKey[crypto_sign_ed25519_SECRETKEYBYTES];
+    KJ_ASSERT(crypto_sign_ed25519_seed_keypair(publicKey, secretKey, random) == 0);
+
     // Write key.
     capnp::MallocMessageBuilder message;
     auto key = message.getRoot<PublicSigningKey>();
-    memcpy(getUnderlyingBytes(kj::cp(key), sizeof(random)), random, sizeof(random));
+    memcpy(getUnderlyingBytes(kj::cp(key), sizeof(publicKey)), publicKey, sizeof(publicKey));
     printKey(key);
     context.exitInfo("*** Don't forget to back up the keyring! ***");
   }
+27 −0		.github/workflows/quick-test.yml
+3 −0		.gitignore
+45 −1		c++/CMakeLists.txt
+32 −0		c++/cmake/CapnProtoConfig.cmake.in
+45 −2		c++/configure.ac
+8 −0		c++/src/capnp/dynamic.h
+12 −0		c++/src/capnp/rpc-twoparty-test.c++
+10 −1		c++/src/capnp/rpc-twoparty.c++
+4 −0		c++/src/capnp/schema-parser.c++
+6 −0		c++/src/capnp/schema-parser.h
+14 −5		c++/src/kj/CMakeLists.txt
+40 −31		c++/src/kj/async-coroutine-test.c++
+2 −0		c++/src/kj/async-inl.h
+9 −1		c++/src/kj/async-io-test.c++
+21 −4		c++/src/kj/async-io-unix.c++
+7 −2		c++/src/kj/async.c++
+6 −1		c++/src/kj/common.h
+45 −3		c++/src/kj/compat/http-test.c++
+23 −2		c++/src/kj/compat/http.c++
+30 −1		c++/src/kj/compat/http.h
+30 −0		c++/src/kj/filesystem-disk-test.c++
+2 −2		c++/src/kj/filesystem-disk-unix.c++
+88 −0		c++/src/kj/table-test.c++
+11 −1		c++/src/kj/table.h
+8 −3		c++/src/kj/windows-sanity.h
+1 −1		doc/cxx.md
+1 −1		doc/language.md
+43 −17		.github/workflows/dotnet-core.yml
+13 −7		build-aux/config.sub
+4 −2		dist-build/wasm32-wasi.sh
+2 −1		packaging/dotnet-core/libsodium.pkgproj
+1 −1		packaging/nuget/package.config
+3 −10		src/libsodium/crypto_core/ed25519/ref10/ed25519_ref10.c
+0 −12		test/default/wasi-test-wrapper.sh