MongoDB and Meteor upgrades

.github/workflows/build.yml

@@ -107,7 +107,7 @@ jobs:
           # the constant below.
           make lint | tee lint.log
           num_problems=$(cat lint.log | grep ' problems (0 errors, ' | awk '{print $2}')
-          [ "$num_problems" = 774 ]
+          [ "$num_problems" = 775 ]
       - name: setup java 11
         uses: actions/setup-java@v4
         with:
@@ -116,7 +116,7 @@ jobs:
       - name: setup chrome
         uses: browser-actions/setup-chrome@v1
         with:
-          chrome-version: 114
+          chrome-version: 142
       - name: remove system chrome
         run: |
           sudo rm -f /usr/bin/google-chrome /usr/bin/google-chrome-stable

hack/.gitignore

@@ -1 +1,2 @@
 sandstorm-171.tar.xz
+*.tgz

make-bundle.sh

@@ -29,6 +29,24 @@ fail() {
 
 trap 'fail ${LINENO}' ERR
 
+secureCurlDownload() {
+  curl --proto '=https' --tlsv1.2 --output "$1" "$2"
+}
+
+verifySha256() {
+  local path=$1
+  local sha256=$2
+  local label=$3
+
+  if ! sha256sum --check <<EOF
+$sha256 *$path
+EOF
+  then
+    echo "$label did not match expected checksum.  Aborting."
+    exit 1
+  fi
+}
+
 copyDep() {
   # Copies a file from the system into the chroot.
 
@@ -109,28 +127,98 @@ cp $METEOR_DEV_BUNDLE/bin/node bundle/bin
 # Pull mongo v2.6 out of a previous Sandstorm package.
 OLD_BUNDLE_BASE=sandstorm-171
 OLD_BUNDLE_FILENAME=$OLD_BUNDLE_BASE.tar.xz
-OLD_BUNDLE_PATH=hack/$OLD_BUNDLE_FILENAME
+OLD_BUNDLE_PATH="hack/$OLD_BUNDLE_FILENAME"
 OLD_BUNDLE_SHA256=ebffd643dffeba349f139bee34e4ce33fd9b1298fafc1d6a31eb35a191059a99
 OLD_MONGO_FILES="$OLD_BUNDLE_BASE/bin/mongo $OLD_BUNDLE_BASE/bin/mongod"
 if [ ! -e "$OLD_BUNDLE_PATH" ] ; then
   echo "Fetching $OLD_BUNDLE_FILENAME to extract a mongo 2.6..."
-  curl --output "$OLD_BUNDLE_PATH" https://dl.sandstorm.io/$OLD_BUNDLE_FILENAME
+  secureCurlDownload "$OLD_BUNDLE_PATH" "https://dl.sandstorm.org/$OLD_BUNDLE_FILENAME"
 fi
 
 # Always check the checksum to guard against corrupted downloads.
-sha256sum --check <<EOF
-$OLD_BUNDLE_SHA256  $OLD_BUNDLE_PATH
-EOF
-# set -e should ensure we don't continue past here, but let's be doubly sure
-rc=$?
-if [ $rc -ne 0 ]; then
-  echo "Old bundle did not match expected checksum.  Aborting."
-  exit 1
-fi
+verifySha256 "$OLD_BUNDLE_PATH" "$OLD_BUNDLE_SHA256" "Old bundle"
 
 # Extract bin/mongo and bin/mongod from the old sandstorm bundle, and place them in bundle/.
 tar xf $OLD_BUNDLE_PATH --transform=s/^${OLD_BUNDLE_BASE}/bundle/ $OLD_MONGO_FILES
 
+# Download MongoDB 2.6.12 to get mongodump (not included in the old Sandstorm bundle).
+MONGO26_VERSION=2.6.12
+MONGO26_FILENAME=mongodb-linux-x86_64-${MONGO26_VERSION}.tgz
+MONGO26_PATH="hack/$MONGO26_FILENAME"
+MONGO26_SHA256=6d6415ac068825d1aed23f9482080ce3551bfac828d9570be1d72990d5f441b0
+if [ ! -e "$MONGO26_PATH" ] ; then
+  echo "Fetching MongoDB 2.6.12 for mongodump..."
+  secureCurlDownload "$MONGO26_PATH" "https://fastdl.mongodb.org/linux/$MONGO26_FILENAME"
+fi
+
+verifySha256 "$MONGO26_PATH" "$MONGO26_SHA256" "MongoDB 2.6.12 package"
+
+# Extract mongodump from MongoDB 2.6.12.
+MONGO26_BASE=mongodb-linux-x86_64-${MONGO26_VERSION}
+tar xf $MONGO26_PATH ${MONGO26_BASE}/bin/mongodump
+cp ${MONGO26_BASE}/bin/mongodump bundle/bin/mongodump
+rm -rf ${MONGO26_BASE}
+
+# Download MongoDB 7.0 for migration support.
+# Both versions are bundled - users run 'sandstorm migrate-mongo'
+# to upgrade their database from 2.6 to 7.0.
+MONGO7_VERSION=7.0.16
+MONGO7_FILENAME=mongodb-linux-x86_64-ubuntu2004-${MONGO7_VERSION}.tgz
+MONGO7_PATH="hack/$MONGO7_FILENAME"
+MONGO7_SHA256=3be980f61bf1eca1680ffdac73d765c857f4596ab678cc244b27f82ab9c404ff
+if [ ! -e "$MONGO7_PATH" ] ; then
+  echo "Fetching MongoDB 7.0..."
+  secureCurlDownload "$MONGO7_PATH" "https://fastdl.mongodb.org/linux/$MONGO7_FILENAME"
+fi
+
+verifySha256 "$MONGO7_PATH" "$MONGO7_SHA256" "MongoDB 7.0 package"
+
+# Extract mongod from MongoDB 7.0 package.
+# Note: MongoDB 7.0 doesn't include the legacy mongo shell, use mongosh instead.
+MONGO7_BASE=mongodb-linux-x86_64-ubuntu2004-${MONGO7_VERSION}
+mkdir -p bundle/bin
+tar xf $MONGO7_PATH ${MONGO7_BASE}/bin/mongod
+cp ${MONGO7_BASE}/bin/mongod bundle/bin/mongod7
+rm -rf ${MONGO7_BASE}
+
+# Download MongoDB Database Tools (mongodump, mongorestore) for MongoDB 7.0.
+# These are distributed separately since MongoDB 4.4+.
+MONGO_TOOLS_VERSION=100.10.0
+MONGO_TOOLS_FILENAME=mongodb-database-tools-ubuntu2004-x86_64-${MONGO_TOOLS_VERSION}.tgz
+MONGO_TOOLS_PATH="hack/$MONGO_TOOLS_FILENAME"
+MONGO_TOOLS_SHA256=74583f31eb2fefa4b7016b525b0f50209a4e20364f41719cc8c93b7156e49937
+if [ ! -e "$MONGO_TOOLS_PATH" ] ; then
+  echo "Fetching MongoDB Database Tools..."
+  secureCurlDownload "$MONGO_TOOLS_PATH" "https://fastdl.mongodb.org/tools/db/$MONGO_TOOLS_FILENAME"
+fi
+
+verifySha256 "$MONGO_TOOLS_PATH" "$MONGO_TOOLS_SHA256" "MongoDB Database Tools package"
+
+# Extract mongorestore from database tools package.
+MONGO_TOOLS_BASE=mongodb-database-tools-ubuntu2004-x86_64-${MONGO_TOOLS_VERSION}
+tar xf $MONGO_TOOLS_PATH ${MONGO_TOOLS_BASE}/bin/mongorestore
+cp ${MONGO_TOOLS_BASE}/bin/mongorestore bundle/bin/mongorestore7
+rm -rf ${MONGO_TOOLS_BASE}
+
+# Download mongosh (MongoDB Shell) for MongoDB 7.0.
+# MongoDB 7.0+ uses mongosh instead of the legacy mongo shell.
+MONGOSH_VERSION=2.3.8
+MONGOSH_FILENAME=mongosh-${MONGOSH_VERSION}-linux-x64.tgz
+MONGOSH_PATH="hack/$MONGOSH_FILENAME"
+MONGOSH_SHA256=23edb768189663aaa9732a2340a25b5fc05a314940538809a7840be7f2ce221f
+if [ ! -e "$MONGOSH_PATH" ] ; then
+  echo "Fetching mongosh..."
+  secureCurlDownload "$MONGOSH_PATH" "https://downloads.mongodb.com/compass/$MONGOSH_FILENAME"
+fi
+
+verifySha256 "$MONGOSH_PATH" "$MONGOSH_SHA256" "mongosh package"
+
+# Extract mongosh binary.
+MONGOSH_BASE=mongosh-${MONGOSH_VERSION}-linux-x64
+tar xf $MONGOSH_PATH ${MONGOSH_BASE}/bin/mongosh
+cp ${MONGOSH_BASE}/bin/mongosh bundle/bin/mongosh
+rm -rf ${MONGOSH_BASE}
+
 cp $(which zip unzip xz gpg) bundle/bin
 
 # 'node-fibers' depends on a package (detect-libc) that uses various heuristics

meteor-testapp/.meteor/release

@@ -1 +1 @@
-METEOR@2.3.6
+METEOR@2.16

shell/.meteor/packages

@@ -4,44 +4,42 @@
 # but you can also edit it by hand.
 
 # ES6 support.
-ecmascript@0.15.3
+ecmascript@0.16.8
 ecmascript-collections
 
 # Formerly standard-app-packages, which was deprecated in favor of meteor-platform,
 # which was deprecated in favor of splitting things out separately
 meteor-base@1.5.1
-underscore@1.0.10
-mongo@1.12.0
+underscore@1.6.1
+mongo@1.16.10
 blaze-html-templates@1.0.4
 jquery@1.11.10
-session@1.2.0
-tracker@1.2.0
-check@1.3.1
+session@1.2.1
+tracker@1.3.3
+check@1.4.1
 reload@1.3.1
-random@1.2.0
+random@1.2.1
 
 iron:router
-accounts-base@2.0.1
-accounts-oauth@1.3.0
+accounts-base@2.2.11
+accounts-oauth@1.4.4
 http@1.4.2
-browser-policy@1.1.0
+browser-policy@1.1.2
 routepolicy@1.1.1
 
-reactive-var@1.0.11
-reactive-dict@1.3.0
+reactive-var@1.0.12
+reactive-dict@1.3.1
 fourseven:scss@4.12.0
 sha@1.0.9
-standard-minifier-css@1.7.3
+standard-minifier-css@1.9.2
 shell-server@0.5.0
-fongandrew:find-and-modify@0.2.2
 
-oauth@2.0.0
-service-configuration@1.1.0
-github-oauth@1.3.1
-google-oauth@1.4.1
-dynamic-import@0.7.1
+oauth@2.2.1
+service-configuration@1.3.4
+github-oauth@1.4.1
+google-oauth@1.4.4
+dynamic-import@0.7.3
 tap:i18n
-typescript@4.3.5
-meteortesting:mocha@=2.0.3
-meteortesting:browser-tests@=1.3.5
+typescript@4.9.5
+meteortesting:mocha
 zodern:standard-minifier-js

shell/.meteor/release

@@ -1 +1 @@
-METEOR@2.3.5
+METEOR@2.16

shell/.meteor/versions

@@ -1,47 +1,45 @@
-accounts-base@2.0.1
-accounts-oauth@1.3.0
-aldeed:simple-schema@1.5.4
-allow-deny@1.1.0
-autoupdate@1.7.0
-babel-compiler@7.7.0
-babel-runtime@1.5.0
+accounts-base@2.2.11
+accounts-oauth@1.4.4
+allow-deny@1.1.1
+autoupdate@1.8.0
+babel-compiler@7.10.5
+babel-runtime@1.5.1
 base64@1.0.12
 binary-heap@1.0.11
-blaze@2.6.1
+blaze@2.7.1
 blaze-html-templates@1.2.1
 blaze-tools@1.1.3
-boilerplate-generator@1.7.1
-browser-policy@1.1.0
-browser-policy-common@1.0.11
-browser-policy-content@1.1.1
-browser-policy-framing@1.1.0
+boilerplate-generator@1.7.2
+browser-policy@1.1.2
+browser-policy-common@1.0.12
+browser-policy-content@1.1.3
+browser-policy-framing@1.1.2
 caching-compiler@1.2.2
 caching-html-compiler@1.2.1
-callback-hook@1.3.1
-cfs:http-methods@0.0.32
-check@1.3.1
-coffeescript@1.0.17
-ddp@1.4.0
-ddp-client@2.5.0
-ddp-common@1.4.0
-ddp-rate-limiter@1.1.0
-ddp-server@2.4.1
+callback-hook@1.5.1
+check@1.4.1
+coffeescript@2.4.1
+coffeescript-compiler@2.4.1
+ddp@1.4.1
+ddp-client@2.6.2
+ddp-common@1.4.1
+ddp-rate-limiter@1.2.1
+ddp-server@2.7.1
 deps@1.0.12
-diff-sequence@1.1.1
-dynamic-import@0.7.1
-ecmascript@0.15.3
+diff-sequence@1.1.2
+dynamic-import@0.7.3
+ecmascript@0.16.8
 ecmascript-collections@0.1.6
-ecmascript-runtime@0.7.0
-ecmascript-runtime-client@0.11.1
-ecmascript-runtime-server@0.10.1
-ejson@1.1.1
+ecmascript-runtime@0.8.1
+ecmascript-runtime-client@0.12.1
+ecmascript-runtime-server@0.11.0
+ejson@1.1.3
 es5-shim@4.8.0
-fetch@0.1.1
-fongandrew:find-and-modify@0.2.2
-fourseven:scss@4.15.0
-geojson-utils@1.0.10
-github-oauth@1.3.1
-google-oauth@1.4.1
+fetch@0.1.4
+fourseven:scss@4.16.0
+geojson-utils@1.0.11
+github-oauth@1.4.1
+google-oauth@1.4.4
 hot-code-push@1.0.4
 html-tools@1.1.3
 htmljs@1.1.1
@@ -58,58 +56,57 @@ iron:router@1.2.0
 iron:url@1.1.0
 jquery@1.11.11
 localstorage@1.2.0
-logging@1.2.0
-mdg:validation-error@0.5.1
-meteor@1.9.3
+logging@1.3.4
+meteor@1.11.5
 meteor-base@1.5.1
 meteorspark:util@0.2.0
-meteortesting:browser-tests@1.3.5
-meteortesting:mocha@2.0.3
+meteortesting:browser-tests@1.5.1
+meteortesting:mocha@2.0.4
 meteortesting:mocha-core@8.1.2
-minifier-css@1.5.4
-minimongo@1.7.0
-modern-browsers@0.1.7
-modules@0.16.0
-modules-runtime@0.12.0
-mongo@1.12.0
-mongo-decimal@0.1.2
+minifier-css@1.6.4
+minimongo@1.9.4
+modern-browsers@0.1.10
+modules@0.20.0
+modules-runtime@0.13.1
+mongo@1.16.10
+mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
-npm-mongo@3.9.1
-oauth@2.0.0
-oauth2@1.3.1
+npm-mongo@4.17.2
+oauth@2.2.1
+oauth2@1.3.2
 observe-sequence@1.0.20
 ordered-dict@1.1.0
-promise@0.12.0
+promise@0.12.2
 raix:eventemitter@0.1.3
-random@1.2.0
-rate-limit@1.0.9
-react-fast-refresh@0.1.1
-reactive-dict@1.3.0
-reactive-var@1.0.11
+random@1.2.1
+rate-limit@1.1.1
+react-fast-refresh@0.2.8
+reactive-dict@1.3.1
+reactive-var@1.0.12
 reload@1.3.1
 retry@1.1.0
 routepolicy@1.1.1
-service-configuration@1.1.0
-session@1.2.0
+service-configuration@1.3.4
+session@1.2.1
 sha@1.0.9
 shell-server@0.5.0
-socket-stream-client@0.4.0
+socket-stream-client@0.5.2
 spacebars@1.3.0
 spacebars-compiler@1.3.1
-standard-minifier-css@1.7.3
-tap:i18n@1.8.2
+standard-minifier-css@1.9.2
+tap:i18n@1.12.4
 templating@1.4.2
 templating-compiler@1.4.1
 templating-runtime@1.6.0
 templating-tools@1.2.2
-tracker@1.2.0
-typescript@4.3.5
+tracker@1.3.3
+typescript@4.9.5
 ui@1.0.13
-underscore@1.0.10
+underscore@1.6.1
 url@1.3.2
-webapp@1.11.1
-webapp-hashing@1.1.0
+webapp@1.13.8
+webapp-hashing@1.1.1
 zodern:caching-minifier@0.4.0
 zodern:minifier-js@4.1.0
 zodern:standard-minifier-js@4.1.1