From e99c22fcc28fdcca0be81431cb09daa5337edff8 Mon Sep 17 00:00:00 2001
From: Ethan Donowitz <edonowitz@mozilla.com>
Date: Fri, 16 Dec 2022 13:15:37 -0500
Subject: [PATCH 01/12] chore: tag 0.13.1

---
 CHANGELOG.md                    | 19 +++++++++++++++++++
 Cargo.lock                      | 14 +++++++-------
 syncserver-common/Cargo.toml    |  2 +-
 syncserver-db-common/Cargo.toml |  2 +-
 syncserver-settings/Cargo.toml  |  2 +-
 syncserver/Cargo.toml           |  2 +-
 syncstorage-settings/Cargo.toml |  2 +-
 tokenserver-common/Cargo.toml   |  2 +-
 tokenserver-settings/Cargo.toml |  2 +-
 9 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 50891303..b0efabc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,22 @@
+<a name="0.13.1"></a>
+## 0.13.1 (2022-12-16)
+
+
+#### Features
+
+*   add token type to Tokenserver log lines (#1445) ([0362bcab](https://github.com/mozilla-services/syncstorage-rs/commit/0362bcab3dd057de201915b918783b0a9a2de15e), closes [#1444](https://github.com/mozilla-services/syncstorage-rs/issues/1444))
+
+#### Bug Fixes
+
+*   fix CORS issue (#1447) ([3f836b1e](https://github.com/mozilla-services/syncstorage-rs/commit/3f836b1e98997d98dd9671f957e5721330182b5f))
+
+#### Chore
+
+*   remove `spanner_config.ini` (#1446) ([b9c1f7f6](https://github.com/mozilla-services/syncstorage-rs/commit/b9c1f7f67b5e4c99642d289a0e124f1053ec54b2))
+*   upgrade to Rust 1.65 (#1441) ([b95e549a](https://github.com/mozilla-services/syncstorage-rs/commit/b95e549acbf2bb31c385eb50f60016da0f54e253))
+
+
+
 <a name="0.13.0"></a>
 ## 0.13.0 (2022-11-14)
 
diff --git a/Cargo.lock b/Cargo.lock
index 20039197..ed940b41 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3001,7 +3001,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver"
-version = "0.13.0"
+version = "0.13.1"
 dependencies = [
  "actix-cors",
  "actix-http",
@@ -3073,7 +3073,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-common"
-version = "0.13.0"
+version = "0.13.1"
 dependencies = [
  "hkdf",
  "sha2",
@@ -3081,7 +3081,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-db-common"
-version = "0.13.0"
+version = "0.13.1"
 dependencies = [
  "async-trait",
  "backtrace",
@@ -3103,7 +3103,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-settings"
-version = "0.13.0"
+version = "0.13.1"
 dependencies = [
  "config 0.11.0",
  "num_cpus",
@@ -3117,7 +3117,7 @@ dependencies = [
 
 [[package]]
 name = "syncstorage-settings"
-version = "0.13.0"
+version = "0.13.1"
 dependencies = [
  "rand 0.8.5",
  "serde 1.0.135",
@@ -3298,7 +3298,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokenserver-common"
-version = "0.13.0"
+version = "0.13.1"
 dependencies = [
  "actix-web",
  "backtrace",
@@ -3311,7 +3311,7 @@ dependencies = [
 
 [[package]]
 name = "tokenserver-settings"
-version = "0.13.0"
+version = "0.13.1"
 dependencies = [
  "serde 1.0.135",
  "tokenserver-common",
diff --git a/syncserver-common/Cargo.toml b/syncserver-common/Cargo.toml
index 913f644e..a8a0dea1 100644
--- a/syncserver-common/Cargo.toml
+++ b/syncserver-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-common"
-version = "0.13.0"
+version = "0.13.1"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver-db-common/Cargo.toml b/syncserver-db-common/Cargo.toml
index 66907615..99e422db 100644
--- a/syncserver-db-common/Cargo.toml
+++ b/syncserver-db-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-db-common"
-version = "0.13.0"
+version = "0.13.1"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver-settings/Cargo.toml b/syncserver-settings/Cargo.toml
index 88994fc3..90071b19 100644
--- a/syncserver-settings/Cargo.toml
+++ b/syncserver-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-settings"
-version = "0.13.0"
+version = "0.13.1"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver/Cargo.toml b/syncserver/Cargo.toml
index fb631a54..759fe464 100644
--- a/syncserver/Cargo.toml
+++ b/syncserver/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver"
-version = "0.13.0"
+version = "0.13.1"
 license = "MPL-2.0"
 authors = [
   "Ben Bangert <ben@groovie.org>",
diff --git a/syncstorage-settings/Cargo.toml b/syncstorage-settings/Cargo.toml
index addf7d9d..c6a989fa 100644
--- a/syncstorage-settings/Cargo.toml
+++ b/syncstorage-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncstorage-settings"
-version = "0.13.0"
+version = "0.13.1"
 edition = "2021"
 
 [dependencies]
diff --git a/tokenserver-common/Cargo.toml b/tokenserver-common/Cargo.toml
index 367b8c50..1847cf11 100644
--- a/tokenserver-common/Cargo.toml
+++ b/tokenserver-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokenserver-common"
-version = "0.13.0"
+version = "0.13.1"
 edition = "2021"
 
 [dependencies]
diff --git a/tokenserver-settings/Cargo.toml b/tokenserver-settings/Cargo.toml
index 12ea59fe..d6b4fa90 100644
--- a/tokenserver-settings/Cargo.toml
+++ b/tokenserver-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokenserver-settings"
-version = "0.13.0"
+version = "0.13.1"
 edition = "2021"
 
 [dependencies]

From d2f6cf65ff412676935e6f4306311e4599e697e9 Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Mon, 6 Feb 2023 13:17:12 -0800
Subject: [PATCH 02/12] chore: add missing util.py to docker for
 process_account_events.py (#1455) (#1457)

and add PyBrowserID for it and tokenlib for purge_old_records.py

SVCSE-474
Issue #1086
---
 Dockerfile                         |  1 +
 tools/tokenserver/requirements.txt | 12 +++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 64714452..1c26b929 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -54,6 +54,7 @@ COPY --from=builder /app/syncserver/version.json /app
 COPY --from=builder /app/tools/spanner /app/tools/spanner
 COPY --from=builder /app/tools/integration_tests /app/tools/integration_tests
 COPY --from=builder /app/tools/tokenserver/process_account_events.py /app/tools/tokenserver/process_account_events.py
+COPY --from=builder /app/tools/tokenserver/util.py /app/tools/tokenserver/util.py
 COPY --from=builder /app/tools/tokenserver/requirements.txt /app/tools/tokenserver/requirements.txt
 COPY --from=builder /app/scripts/prepare-spanner.sh /app/scripts/prepare-spanner.sh
 COPY --from=builder /app/syncserver/src/db/spanner/schema.ddl /app/schema.ddl
diff --git a/tools/tokenserver/requirements.txt b/tools/tokenserver/requirements.txt
index f116d8c0..2fc4fa37 100644
--- a/tools/tokenserver/requirements.txt
+++ b/tools/tokenserver/requirements.txt
@@ -1,6 +1,8 @@
-boto
-hawkauthlib
-mysqlclient
-pyramid
-sqlalchemy
+boto==2.49.0
+hawkauthlib==2.0.0
+mysqlclient==2.1.1
+pyramid==2.0.1
+sqlalchemy==1.4.46
 testfixtures
+tokenlib==2.0.0
+PyBrowserID==0.14.0

From fb406a055b924a324a751716fc291349c9cbea1d Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Mon, 6 Feb 2023 13:20:15 -0800
Subject: [PATCH 03/12] chore: tag 0.13.2

---
 CHANGELOG.md                    | 10 ++++++++++
 Cargo.lock                      | 14 +++++++-------
 syncserver-common/Cargo.toml    |  2 +-
 syncserver-db-common/Cargo.toml |  2 +-
 syncserver-settings/Cargo.toml  |  2 +-
 syncserver/Cargo.toml           |  2 +-
 syncstorage-settings/Cargo.toml |  2 +-
 tokenserver-common/Cargo.toml   |  2 +-
 tokenserver-settings/Cargo.toml |  2 +-
 9 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0efabc0..48eefc07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="0.13.2"></a>
+## 0.13.2 (2023-02-06)
+
+
+#### Chore
+
+*   add missing util.py to docker for process_account_events.py (#1455) (#1457) ([d2f6cf65](https://github.com/mozilla-services/syncstorage-rs/commit/d2f6cf65ff412676935e6f4306311e4599e697e9))
+
+
+
 <a name="0.13.1"></a>
 ## 0.13.1 (2022-12-16)
 
diff --git a/Cargo.lock b/Cargo.lock
index ed940b41..3aff5280 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3001,7 +3001,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver"
-version = "0.13.1"
+version = "0.13.2"
 dependencies = [
  "actix-cors",
  "actix-http",
@@ -3073,7 +3073,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-common"
-version = "0.13.1"
+version = "0.13.2"
 dependencies = [
  "hkdf",
  "sha2",
@@ -3081,7 +3081,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-db-common"
-version = "0.13.1"
+version = "0.13.2"
 dependencies = [
  "async-trait",
  "backtrace",
@@ -3103,7 +3103,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-settings"
-version = "0.13.1"
+version = "0.13.2"
 dependencies = [
  "config 0.11.0",
  "num_cpus",
@@ -3117,7 +3117,7 @@ dependencies = [
 
 [[package]]
 name = "syncstorage-settings"
-version = "0.13.1"
+version = "0.13.2"
 dependencies = [
  "rand 0.8.5",
  "serde 1.0.135",
@@ -3298,7 +3298,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokenserver-common"
-version = "0.13.1"
+version = "0.13.2"
 dependencies = [
  "actix-web",
  "backtrace",
@@ -3311,7 +3311,7 @@ dependencies = [
 
 [[package]]
 name = "tokenserver-settings"
-version = "0.13.1"
+version = "0.13.2"
 dependencies = [
  "serde 1.0.135",
  "tokenserver-common",
diff --git a/syncserver-common/Cargo.toml b/syncserver-common/Cargo.toml
index a8a0dea1..65204166 100644
--- a/syncserver-common/Cargo.toml
+++ b/syncserver-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-common"
-version = "0.13.1"
+version = "0.13.2"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver-db-common/Cargo.toml b/syncserver-db-common/Cargo.toml
index 99e422db..2b30d144 100644
--- a/syncserver-db-common/Cargo.toml
+++ b/syncserver-db-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-db-common"
-version = "0.13.1"
+version = "0.13.2"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver-settings/Cargo.toml b/syncserver-settings/Cargo.toml
index 90071b19..8981a747 100644
--- a/syncserver-settings/Cargo.toml
+++ b/syncserver-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-settings"
-version = "0.13.1"
+version = "0.13.2"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver/Cargo.toml b/syncserver/Cargo.toml
index 759fe464..c3f8037e 100644
--- a/syncserver/Cargo.toml
+++ b/syncserver/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver"
-version = "0.13.1"
+version = "0.13.2"
 license = "MPL-2.0"
 authors = [
   "Ben Bangert <ben@groovie.org>",
diff --git a/syncstorage-settings/Cargo.toml b/syncstorage-settings/Cargo.toml
index c6a989fa..3d4419cf 100644
--- a/syncstorage-settings/Cargo.toml
+++ b/syncstorage-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncstorage-settings"
-version = "0.13.1"
+version = "0.13.2"
 edition = "2021"
 
 [dependencies]
diff --git a/tokenserver-common/Cargo.toml b/tokenserver-common/Cargo.toml
index 1847cf11..486b0e86 100644
--- a/tokenserver-common/Cargo.toml
+++ b/tokenserver-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokenserver-common"
-version = "0.13.1"
+version = "0.13.2"
 edition = "2021"
 
 [dependencies]
diff --git a/tokenserver-settings/Cargo.toml b/tokenserver-settings/Cargo.toml
index d6b4fa90..4f329f98 100644
--- a/tokenserver-settings/Cargo.toml
+++ b/tokenserver-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokenserver-settings"
-version = "0.13.1"
+version = "0.13.2"
 edition = "2021"
 
 [dependencies]

From 6ee39da4a0926e6352bf513206d1d01b63232a2e Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Fri, 24 Feb 2023 09:16:44 -0800
Subject: [PATCH 04/12] chore: add another missing file to docker for
 process_account_events.py (#1463)

(just add the whole dir this time)

SVCSE-474
Issue #1086
---
 Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1c26b929..7a613456 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,9 +53,7 @@ COPY --from=builder /app/bin /app/bin
 COPY --from=builder /app/syncserver/version.json /app
 COPY --from=builder /app/tools/spanner /app/tools/spanner
 COPY --from=builder /app/tools/integration_tests /app/tools/integration_tests
-COPY --from=builder /app/tools/tokenserver/process_account_events.py /app/tools/tokenserver/process_account_events.py
-COPY --from=builder /app/tools/tokenserver/util.py /app/tools/tokenserver/util.py
-COPY --from=builder /app/tools/tokenserver/requirements.txt /app/tools/tokenserver/requirements.txt
+COPY --from=builder /app/tools/tokenserver /app/tools/tokenserver
 COPY --from=builder /app/scripts/prepare-spanner.sh /app/scripts/prepare-spanner.sh
 COPY --from=builder /app/syncserver/src/db/spanner/schema.ddl /app/schema.ddl
 

From 2eecb8caca0a812d9500ebfe805e2846fe6ece76 Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Fri, 24 Feb 2023 09:19:30 -0800
Subject: [PATCH 05/12] chore: tag 0.13.3

---
 CHANGELOG.md                    | 10 ++++++++++
 Cargo.lock                      | 14 +++++++-------
 syncserver-common/Cargo.toml    |  2 +-
 syncserver-db-common/Cargo.toml |  2 +-
 syncserver-settings/Cargo.toml  |  2 +-
 syncserver/Cargo.toml           |  2 +-
 syncstorage-settings/Cargo.toml |  2 +-
 tokenserver-common/Cargo.toml   |  2 +-
 tokenserver-settings/Cargo.toml |  2 +-
 9 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48eefc07..bc40110f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="0.13.3"></a>
+## 0.13.3 (2023-02-24)
+
+
+#### Chore
+
+*   add another missing file to docker for process_account_events.py (#1463) ([6ee39da4](https://github.com/mozilla-services/syncstorage-rs/commit/6ee39da4a0926e6352bf513206d1d01b63232a2e))
+
+
+
 <a name="0.13.2"></a>
 ## 0.13.2 (2023-02-06)
 
diff --git a/Cargo.lock b/Cargo.lock
index 3aff5280..a0d6c1a4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3001,7 +3001,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver"
-version = "0.13.2"
+version = "0.13.3"
 dependencies = [
  "actix-cors",
  "actix-http",
@@ -3073,7 +3073,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-common"
-version = "0.13.2"
+version = "0.13.3"
 dependencies = [
  "hkdf",
  "sha2",
@@ -3081,7 +3081,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-db-common"
-version = "0.13.2"
+version = "0.13.3"
 dependencies = [
  "async-trait",
  "backtrace",
@@ -3103,7 +3103,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-settings"
-version = "0.13.2"
+version = "0.13.3"
 dependencies = [
  "config 0.11.0",
  "num_cpus",
@@ -3117,7 +3117,7 @@ dependencies = [
 
 [[package]]
 name = "syncstorage-settings"
-version = "0.13.2"
+version = "0.13.3"
 dependencies = [
  "rand 0.8.5",
  "serde 1.0.135",
@@ -3298,7 +3298,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokenserver-common"
-version = "0.13.2"
+version = "0.13.3"
 dependencies = [
  "actix-web",
  "backtrace",
@@ -3311,7 +3311,7 @@ dependencies = [
 
 [[package]]
 name = "tokenserver-settings"
-version = "0.13.2"
+version = "0.13.3"
 dependencies = [
  "serde 1.0.135",
  "tokenserver-common",
diff --git a/syncserver-common/Cargo.toml b/syncserver-common/Cargo.toml
index 65204166..82365b07 100644
--- a/syncserver-common/Cargo.toml
+++ b/syncserver-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-common"
-version = "0.13.2"
+version = "0.13.3"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver-db-common/Cargo.toml b/syncserver-db-common/Cargo.toml
index 2b30d144..5f456a16 100644
--- a/syncserver-db-common/Cargo.toml
+++ b/syncserver-db-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-db-common"
-version = "0.13.2"
+version = "0.13.3"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver-settings/Cargo.toml b/syncserver-settings/Cargo.toml
index 8981a747..f87fcf1c 100644
--- a/syncserver-settings/Cargo.toml
+++ b/syncserver-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-settings"
-version = "0.13.2"
+version = "0.13.3"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver/Cargo.toml b/syncserver/Cargo.toml
index c3f8037e..423f509b 100644
--- a/syncserver/Cargo.toml
+++ b/syncserver/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver"
-version = "0.13.2"
+version = "0.13.3"
 license = "MPL-2.0"
 authors = [
   "Ben Bangert <ben@groovie.org>",
diff --git a/syncstorage-settings/Cargo.toml b/syncstorage-settings/Cargo.toml
index 3d4419cf..f9c55ae2 100644
--- a/syncstorage-settings/Cargo.toml
+++ b/syncstorage-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncstorage-settings"
-version = "0.13.2"
+version = "0.13.3"
 edition = "2021"
 
 [dependencies]
diff --git a/tokenserver-common/Cargo.toml b/tokenserver-common/Cargo.toml
index 486b0e86..d71c0546 100644
--- a/tokenserver-common/Cargo.toml
+++ b/tokenserver-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokenserver-common"
-version = "0.13.2"
+version = "0.13.3"
 edition = "2021"
 
 [dependencies]
diff --git a/tokenserver-settings/Cargo.toml b/tokenserver-settings/Cargo.toml
index 4f329f98..7589f220 100644
--- a/tokenserver-settings/Cargo.toml
+++ b/tokenserver-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokenserver-settings"
-version = "0.13.2"
+version = "0.13.3"
 edition = "2021"
 
 [dependencies]

From 028b8b1fb496cdc0ec3a84c4f445ca37c8f2cf5e Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Fri, 24 Feb 2023 11:09:52 -0800
Subject: [PATCH 06/12] chore: tag 0.13.4

---
 CHANGELOG.md                    |  8 ++++++++
 Cargo.lock                      | 14 +++++++-------
 syncserver-common/Cargo.toml    |  2 +-
 syncserver-db-common/Cargo.toml |  2 +-
 syncserver-settings/Cargo.toml  |  2 +-
 syncserver/Cargo.toml           |  2 +-
 syncstorage-settings/Cargo.toml |  2 +-
 tokenserver-common/Cargo.toml   |  2 +-
 tokenserver-settings/Cargo.toml |  2 +-
 9 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc40110f..601a8fce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="0.13.4"></a>
+## 0.13.4 (2023-02-24)
+
+
+*   Re-tag 0.13.3
+
+
+
 <a name="0.13.3"></a>
 ## 0.13.3 (2023-02-24)
 
diff --git a/Cargo.lock b/Cargo.lock
index a0d6c1a4..c0d1720f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3001,7 +3001,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver"
-version = "0.13.3"
+version = "0.13.4"
 dependencies = [
  "actix-cors",
  "actix-http",
@@ -3073,7 +3073,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-common"
-version = "0.13.3"
+version = "0.13.4"
 dependencies = [
  "hkdf",
  "sha2",
@@ -3081,7 +3081,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-db-common"
-version = "0.13.3"
+version = "0.13.4"
 dependencies = [
  "async-trait",
  "backtrace",
@@ -3103,7 +3103,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-settings"
-version = "0.13.3"
+version = "0.13.4"
 dependencies = [
  "config 0.11.0",
  "num_cpus",
@@ -3117,7 +3117,7 @@ dependencies = [
 
 [[package]]
 name = "syncstorage-settings"
-version = "0.13.3"
+version = "0.13.4"
 dependencies = [
  "rand 0.8.5",
  "serde 1.0.135",
@@ -3298,7 +3298,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokenserver-common"
-version = "0.13.3"
+version = "0.13.4"
 dependencies = [
  "actix-web",
  "backtrace",
@@ -3311,7 +3311,7 @@ dependencies = [
 
 [[package]]
 name = "tokenserver-settings"
-version = "0.13.3"
+version = "0.13.4"
 dependencies = [
  "serde 1.0.135",
  "tokenserver-common",
diff --git a/syncserver-common/Cargo.toml b/syncserver-common/Cargo.toml
index 82365b07..f3a89931 100644
--- a/syncserver-common/Cargo.toml
+++ b/syncserver-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-common"
-version = "0.13.3"
+version = "0.13.4"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver-db-common/Cargo.toml b/syncserver-db-common/Cargo.toml
index 5f456a16..33c47443 100644
--- a/syncserver-db-common/Cargo.toml
+++ b/syncserver-db-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-db-common"
-version = "0.13.3"
+version = "0.13.4"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver-settings/Cargo.toml b/syncserver-settings/Cargo.toml
index f87fcf1c..f0fcd59a 100644
--- a/syncserver-settings/Cargo.toml
+++ b/syncserver-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-settings"
-version = "0.13.3"
+version = "0.13.4"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver/Cargo.toml b/syncserver/Cargo.toml
index 423f509b..4d872656 100644
--- a/syncserver/Cargo.toml
+++ b/syncserver/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver"
-version = "0.13.3"
+version = "0.13.4"
 license = "MPL-2.0"
 authors = [
   "Ben Bangert <ben@groovie.org>",
diff --git a/syncstorage-settings/Cargo.toml b/syncstorage-settings/Cargo.toml
index f9c55ae2..b870e7ed 100644
--- a/syncstorage-settings/Cargo.toml
+++ b/syncstorage-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncstorage-settings"
-version = "0.13.3"
+version = "0.13.4"
 edition = "2021"
 
 [dependencies]
diff --git a/tokenserver-common/Cargo.toml b/tokenserver-common/Cargo.toml
index d71c0546..785e9898 100644
--- a/tokenserver-common/Cargo.toml
+++ b/tokenserver-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokenserver-common"
-version = "0.13.3"
+version = "0.13.4"
 edition = "2021"
 
 [dependencies]
diff --git a/tokenserver-settings/Cargo.toml b/tokenserver-settings/Cargo.toml
index 7589f220..141ad467 100644
--- a/tokenserver-settings/Cargo.toml
+++ b/tokenserver-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokenserver-settings"
-version = "0.13.3"
+version = "0.13.4"
 edition = "2021"
 
 [dependencies]

From 7e298c2dd06dc12a0dbc2d7e6d5aab8ab8bdfba6 Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Fri, 3 Mar 2023 14:11:35 -0800
Subject: [PATCH 07/12] fix: handle nullable (None) keys_changed_at values
 (#1464)

a regression from the Python 3 conversion (max's changes)

SVCSE-3633
---
 tools/tokenserver/database.py                 | 35 ++++++++------
 .../test_process_account_events.py            | 46 +++++++++++++++++++
 2 files changed, 68 insertions(+), 13 deletions(-)

diff --git a/tools/tokenserver/database.py b/tools/tokenserver/database.py
index 214c0d89..d1aa711b 100644
--- a/tools/tokenserver/database.py
+++ b/tools/tokenserver/database.py
@@ -334,15 +334,12 @@ class Database:
             res = self._execute_sql(_UPDATE_USER_RECORD_IN_PLACE, **params)
             res.close()
 
-            user['generation'] = max([x
-                                      for x
-                                      in [generation, user['generation']]
-                                      if x is not None])
-            user['keys_changed_at'] = max([x
-                                           for x
-                                           in [keys_changed_at,
-                                               user['keys_changed_at']]
-                                           if x is not None])
+            if generation is not None:
+                user['generation'] = max(user['generation'], generation)
+            user['keys_changed_at'] = max_keys_changed_at(
+                user,
+                keys_changed_at
+            )
         else:
             # Reject previously-seen client-state strings.
             if client_state is None:
@@ -369,10 +366,7 @@ class Database:
                 generation = max(user['generation'], generation)
             else:
                 generation = user['generation']
-            if keys_changed_at is not None:
-                keys_changed_at = max(user['keys_changed_at'], keys_changed_at)
-            else:
-                keys_changed_at = user['keys_changed_at']
+            keys_changed_at = max_keys_changed_at(user, keys_changed_at)
             now = get_timestamp()
             params = {
                 'service': self._get_service_id(SERVICE_NAME),
@@ -650,3 +644,18 @@ class Database:
         if row is None:
             raise Exception('unknown node: ' + node)
         return row
+
+
+def max_keys_changed_at(user, keys_changed_at):
+    """Return the largest `keys_changed_at` between the user record and the
+    specified value.
+
+    May return `None` as the column is nullable.
+
+    """
+    it = (
+        x
+        for x in (keys_changed_at, user['keys_changed_at'])
+        if x is not None
+    )
+    return max(it, default=None)
diff --git a/tools/tokenserver/test_process_account_events.py b/tools/tokenserver/test_process_account_events.py
index 2ecc920d..4147f69e 100644
--- a/tools/tokenserver/test_process_account_events.py
+++ b/tools/tokenserver/test_process_account_events.py
@@ -246,3 +246,49 @@ class TestProcessAccountEvents(unittest.TestCase):
         process_account_event('{ "Message": "[1, 2, 3"] }')
         self.assertMessageWasLogged("Invalid account message")
         self.clearLogs()
+
+    def test_update_with_no_keys_changed_at(self):
+        user = self.database.allocate_user(
+            EMAIL,
+            generation=12,
+            keys_changed_at=None
+        )
+
+        # These update_user calls previously failed (SYNC-3633)
+        self.database.update_user(user, generation=13)
+        self.database.update_user(
+            user,
+            generation=14,
+            client_state="abcdef",
+            keys_changed_at=13
+        )
+
+        process_account_event(message_body(
+            event="reset",
+            uid=UID,
+            iss=ISS,
+            generation=43,
+        ))
+
+        user = self.database.get_user(EMAIL)
+        self.assertEquals(user["generation"], 42)
+
+    def test_update_with_no_keys_changed_at2(self):
+        user = self.database.allocate_user(
+            EMAIL,
+            generation=12,
+            keys_changed_at=None
+        )
+        # Mark the current record as replaced. This can probably only occur
+        # during a race condition in row creation
+        self.database.replace_user_record(user["uid"])
+
+        process_account_event(message_body(
+            event="reset",
+            uid=UID,
+            iss=ISS,
+            generation=43,
+        ))
+
+        user = self.database.get_user(EMAIL)
+        self.assertEquals(user["generation"], 42)

From ecb29025a6915ca37936b6286835eb42cdef9c18 Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Fri, 3 Mar 2023 14:12:59 -0800
Subject: [PATCH 08/12] chore: tag 0.13.5

---
 CHANGELOG.md                    | 10 ++++++++++
 Cargo.lock                      | 14 +++++++-------
 syncserver-common/Cargo.toml    |  2 +-
 syncserver-db-common/Cargo.toml |  2 +-
 syncserver-settings/Cargo.toml  |  2 +-
 syncserver/Cargo.toml           |  2 +-
 syncstorage-settings/Cargo.toml |  2 +-
 tokenserver-common/Cargo.toml   |  2 +-
 tokenserver-settings/Cargo.toml |  2 +-
 9 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 601a8fce..0bbcd4c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="0.13.5"></a>
+## 0.13.5 (2023-03-03)
+
+
+#### Bug Fixes
+
+*   handle nullable (None) keys_changed_at values (#1464) ([7e298c2d](https://github.com/mozilla-services/syncstorage-rs/commit/7e298c2dd06dc12a0dbc2d7e6d5aab8ab8bdfba6))
+
+
+
 <a name="0.13.4"></a>
 ## 0.13.4 (2023-02-24)
 
diff --git a/Cargo.lock b/Cargo.lock
index c0d1720f..3784894c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3001,7 +3001,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver"
-version = "0.13.4"
+version = "0.13.5"
 dependencies = [
  "actix-cors",
  "actix-http",
@@ -3073,7 +3073,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-common"
-version = "0.13.4"
+version = "0.13.5"
 dependencies = [
  "hkdf",
  "sha2",
@@ -3081,7 +3081,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-db-common"
-version = "0.13.4"
+version = "0.13.5"
 dependencies = [
  "async-trait",
  "backtrace",
@@ -3103,7 +3103,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-settings"
-version = "0.13.4"
+version = "0.13.5"
 dependencies = [
  "config 0.11.0",
  "num_cpus",
@@ -3117,7 +3117,7 @@ dependencies = [
 
 [[package]]
 name = "syncstorage-settings"
-version = "0.13.4"
+version = "0.13.5"
 dependencies = [
  "rand 0.8.5",
  "serde 1.0.135",
@@ -3298,7 +3298,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokenserver-common"
-version = "0.13.4"
+version = "0.13.5"
 dependencies = [
  "actix-web",
  "backtrace",
@@ -3311,7 +3311,7 @@ dependencies = [
 
 [[package]]
 name = "tokenserver-settings"
-version = "0.13.4"
+version = "0.13.5"
 dependencies = [
  "serde 1.0.135",
  "tokenserver-common",
diff --git a/syncserver-common/Cargo.toml b/syncserver-common/Cargo.toml
index f3a89931..a950a7d2 100644
--- a/syncserver-common/Cargo.toml
+++ b/syncserver-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-common"
-version = "0.13.4"
+version = "0.13.5"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver-db-common/Cargo.toml b/syncserver-db-common/Cargo.toml
index 33c47443..cca30178 100644
--- a/syncserver-db-common/Cargo.toml
+++ b/syncserver-db-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-db-common"
-version = "0.13.4"
+version = "0.13.5"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver-settings/Cargo.toml b/syncserver-settings/Cargo.toml
index f0fcd59a..142b0a7d 100644
--- a/syncserver-settings/Cargo.toml
+++ b/syncserver-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-settings"
-version = "0.13.4"
+version = "0.13.5"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver/Cargo.toml b/syncserver/Cargo.toml
index 4d872656..8fe48ec1 100644
--- a/syncserver/Cargo.toml
+++ b/syncserver/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver"
-version = "0.13.4"
+version = "0.13.5"
 license = "MPL-2.0"
 authors = [
   "Ben Bangert <ben@groovie.org>",
diff --git a/syncstorage-settings/Cargo.toml b/syncstorage-settings/Cargo.toml
index b870e7ed..47902491 100644
--- a/syncstorage-settings/Cargo.toml
+++ b/syncstorage-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncstorage-settings"
-version = "0.13.4"
+version = "0.13.5"
 edition = "2021"
 
 [dependencies]
diff --git a/tokenserver-common/Cargo.toml b/tokenserver-common/Cargo.toml
index 785e9898..967ab827 100644
--- a/tokenserver-common/Cargo.toml
+++ b/tokenserver-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokenserver-common"
-version = "0.13.4"
+version = "0.13.5"
 edition = "2021"
 
 [dependencies]
diff --git a/tokenserver-settings/Cargo.toml b/tokenserver-settings/Cargo.toml
index 141ad467..e5ea2232 100644
--- a/tokenserver-settings/Cargo.toml
+++ b/tokenserver-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokenserver-settings"
-version = "0.13.4"
+version = "0.13.5"
 edition = "2021"
 
 [dependencies]

From 31192d52c9677e5b5def9ffc62fd43099e499bd1 Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Mon, 6 Mar 2023 16:43:34 -0800
Subject: [PATCH 09/12] fix: connect to the db once instead of every loop
 iteration

SYNC-3638
---
 tools/tokenserver/process_account_events.py   |  6 +--
 .../test_process_account_events.py            | 41 ++++++++++---------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/tools/tokenserver/process_account_events.py b/tools/tokenserver/process_account_events.py
index 98ea0f19..69cf700c 100644
--- a/tools/tokenserver/process_account_events.py
+++ b/tools/tokenserver/process_account_events.py
@@ -51,6 +51,7 @@ def process_account_events(queue_name, aws_region=None, queue_wait_time=20):
     to interrupt execution you'll need to e.g. SIGINT the process.
     """
     logger.info("Processing account events from %s", queue_name)
+    database = Database()
     try:
         # Connect to the SQS queue.
         # If no region is given, infer it from the instance metadata.
@@ -68,7 +69,7 @@ def process_account_events(queue_name, aws_region=None, queue_wait_time=20):
             msg = queue.read(wait_time_seconds=queue_wait_time)
             if msg is None:
                 continue
-            process_account_event(msg.get_body())
+            process_account_event(database, msg.get_body())
             # This intentionally deletes the event even if it was some
             # unrecognized type.  Not point leaving a backlog.
             queue.delete_message(msg)
@@ -77,9 +78,8 @@ def process_account_events(queue_name, aws_region=None, queue_wait_time=20):
         raise
 
 
-def process_account_event(body):
+def process_account_event(database, body):
     """Parse and process a single account event."""
-    database = Database()
     # Try very hard not to error out if there's junk in the queue.
     email = None
     event_type = None
diff --git a/tools/tokenserver/test_process_account_events.py b/tools/tokenserver/test_process_account_events.py
index 4147f69e..52941b25 100644
--- a/tools/tokenserver/test_process_account_events.py
+++ b/tools/tokenserver/test_process_account_events.py
@@ -61,6 +61,9 @@ class TestProcessAccountEvents(unittest.TestCase):
     def clearLogs(self):
         del self.logs.records[:]
 
+    def process_account_event(self, body):
+        process_account_event(self.database, body)
+
     def test_delete_user(self):
         self.database.allocate_user(EMAIL)
         user = self.database.get_user(EMAIL)
@@ -69,7 +72,7 @@ class TestProcessAccountEvents(unittest.TestCase):
         self.assertEquals(len(records), 2)
         self.assertTrue(records[0]["replaced_at"] is not None)
 
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="delete",
             uid=UID,
             iss=ISS,
@@ -88,7 +91,7 @@ class TestProcessAccountEvents(unittest.TestCase):
         self.assertEquals(len(records), 2)
         self.assertTrue(records[0]["replaced_at"] is not None)
 
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="delete",
             uid=EMAIL,
         ))
@@ -102,7 +105,7 @@ class TestProcessAccountEvents(unittest.TestCase):
         records = list(self.database.get_user_records(EMAIL))
         self.assertEquals(len(records), 0)
 
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="delete",
             uid=UID,
             iss=ISS
@@ -114,7 +117,7 @@ class TestProcessAccountEvents(unittest.TestCase):
     def test_reset_user(self):
         self.database.allocate_user(EMAIL, generation=12)
 
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="reset",
             uid=UID,
             iss=ISS,
@@ -127,7 +130,7 @@ class TestProcessAccountEvents(unittest.TestCase):
     def test_reset_user_by_legacy_uid_format(self):
         self.database.allocate_user(EMAIL, generation=12)
 
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="reset",
             uid=EMAIL,
             generation=43,
@@ -140,7 +143,7 @@ class TestProcessAccountEvents(unittest.TestCase):
         records = list(self.database.get_user_records(EMAIL))
         self.assertEquals(len(records), 0)
 
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="reset",
             uid=UID,
             iss=ISS,
@@ -153,7 +156,7 @@ class TestProcessAccountEvents(unittest.TestCase):
     def test_password_change(self):
         self.database.allocate_user(EMAIL, generation=12)
 
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="passwordChange",
             uid=UID,
             iss=ISS,
@@ -167,7 +170,7 @@ class TestProcessAccountEvents(unittest.TestCase):
         records = list(self.database.get_user_records(EMAIL))
         self.assertEquals(len(records), 0)
 
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="passwordChange",
             uid=UID,
             iss=ISS,
@@ -180,7 +183,7 @@ class TestProcessAccountEvents(unittest.TestCase):
     def test_malformed_events(self):
 
         # Unknown event type.
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="party",
             uid=UID,
             iss=ISS,
@@ -190,7 +193,7 @@ class TestProcessAccountEvents(unittest.TestCase):
         self.clearLogs()
 
         # Missing event type.
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             uid=UID,
             iss=ISS,
             generation=43,
@@ -199,7 +202,7 @@ class TestProcessAccountEvents(unittest.TestCase):
         self.clearLogs()
 
         # Missing uid.
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="delete",
             iss=ISS,
         ))
@@ -207,7 +210,7 @@ class TestProcessAccountEvents(unittest.TestCase):
         self.clearLogs()
 
         # Missing generation for reset events.
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="reset",
             uid=UID,
             iss=ISS,
@@ -216,7 +219,7 @@ class TestProcessAccountEvents(unittest.TestCase):
         self.clearLogs()
 
         # Missing generation for passwordChange events.
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="passwordChange",
             uid=UID,
             iss=ISS,
@@ -225,7 +228,7 @@ class TestProcessAccountEvents(unittest.TestCase):
         self.clearLogs()
 
         # Missing issuer with nonemail uid
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="delete",
             uid=UID,
         ))
@@ -233,17 +236,17 @@ class TestProcessAccountEvents(unittest.TestCase):
         self.clearLogs()
 
         # Non-JSON garbage.
-        process_account_event("wat")
+        self.process_account_event("wat")
         self.assertMessageWasLogged("Invalid account message")
         self.clearLogs()
 
         # Non-JSON garbage in Message field.
-        process_account_event('{ "Message": "wat" }')
+        self.process_account_event('{ "Message": "wat" }')
         self.assertMessageWasLogged("Invalid account message")
         self.clearLogs()
 
         # Badly-typed JSON value in Message field.
-        process_account_event('{ "Message": "[1, 2, 3"] }')
+        self.process_account_event('{ "Message": "[1, 2, 3"] }')
         self.assertMessageWasLogged("Invalid account message")
         self.clearLogs()
 
@@ -263,7 +266,7 @@ class TestProcessAccountEvents(unittest.TestCase):
             keys_changed_at=13
         )
 
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="reset",
             uid=UID,
             iss=ISS,
@@ -283,7 +286,7 @@ class TestProcessAccountEvents(unittest.TestCase):
         # during a race condition in row creation
         self.database.replace_user_record(user["uid"])
 
-        process_account_event(message_body(
+        self.process_account_event(message_body(
             event="reset",
             uid=UID,
             iss=ISS,

From 670d68325d48f1f0f7b02e431807aa6dcd252e5f Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Mon, 6 Mar 2023 17:06:36 -0800
Subject: [PATCH 10/12] chore: update tempfile crate

to remove the remove_dir_all dep (avoiding RUSTSEC-2023-0018)
---
 Cargo.lock | 154 +++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 138 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3784894c..d6940ba6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -988,6 +988,27 @@ dependencies = [
  "serde 1.0.135",
 ]
 
+[[package]]
+name = "errno"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "winapi 0.3.9",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "failure"
 version = "0.1.8"
@@ -1540,6 +1561,16 @@ dependencies = [
  "cfg-if 1.0.0",
 ]
 
+[[package]]
+name = "io-lifetimes"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3"
+dependencies = [
+ "libc",
+ "windows-sys 0.45.0",
+]
+
 [[package]]
 name = "iovec"
 version = "0.1.4"
@@ -1631,9 +1662,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.113"
+version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eef78b64d87775463c549fbd80e19249ef436ea3bf1de2a1eb7e717ec7fab1e9"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 
 [[package]]
 name = "libloading"
@@ -1663,6 +1694,12 @@ version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+
 [[package]]
 name = "lock_api"
 version = "0.4.5"
@@ -2348,15 +2385,6 @@ version = "0.6.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "reqwest"
 version = "0.10.10"
@@ -2458,6 +2486,20 @@ dependencies = [
  "semver 1.0.4",
 ]
 
+[[package]]
+name = "rustix"
+version = "0.36.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.45.0",
+]
+
 [[package]]
 name = "rustls"
 version = "0.18.1"
@@ -3145,16 +3187,15 @@ checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
 
 [[package]]
 name = "tempfile"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
+checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95"
 dependencies = [
  "cfg-if 1.0.0",
  "fastrand",
- "libc",
  "redox_syscall",
- "remove_dir_all",
- "winapi 0.3.9",
+ "rustix",
+ "windows-sys 0.42.0",
 ]
 
 [[package]]
@@ -3814,6 +3855,87 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows-sys"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+
 [[package]]
 name = "winreg"
 version = "0.6.2"

From d700e473495f45e54b4e76dfe20e8cd78050d88a Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Mon, 6 Mar 2023 17:54:52 -0800
Subject: [PATCH 11/12] chore: tag 0.13.6

---
 CHANGELOG.md                    | 14 ++++++++++++++
 Cargo.lock                      | 14 +++++++-------
 syncserver-common/Cargo.toml    |  2 +-
 syncserver-db-common/Cargo.toml |  2 +-
 syncserver-settings/Cargo.toml  |  2 +-
 syncserver/Cargo.toml           |  2 +-
 syncstorage-settings/Cargo.toml |  2 +-
 tokenserver-common/Cargo.toml   |  2 +-
 tokenserver-settings/Cargo.toml |  2 +-
 9 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bbcd4c4..d9a80a77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+<a name="0.13.6"></a>
+## 0.13.6 (2023-03-07)
+
+
+#### Chore
+
+*   update tempfile crate ([670d6832](https://github.com/mozilla-services/syncstorage-rs/commit/670d68325d48f1f0f7b02e431807aa6dcd252e5f))
+
+#### Bug Fixes
+
+*   connect to the db once instead of every loop iteration ([31192d52](https://github.com/mozilla-services/syncstorage-rs/commit/31192d52c9677e5b5def9ffc62fd43099e499bd1))
+
+
+
 <a name="0.13.5"></a>
 ## 0.13.5 (2023-03-03)
 
diff --git a/Cargo.lock b/Cargo.lock
index d6940ba6..00406a87 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3043,7 +3043,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver"
-version = "0.13.5"
+version = "0.13.6"
 dependencies = [
  "actix-cors",
  "actix-http",
@@ -3115,7 +3115,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-common"
-version = "0.13.5"
+version = "0.13.6"
 dependencies = [
  "hkdf",
  "sha2",
@@ -3123,7 +3123,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-db-common"
-version = "0.13.5"
+version = "0.13.6"
 dependencies = [
  "async-trait",
  "backtrace",
@@ -3145,7 +3145,7 @@ dependencies = [
 
 [[package]]
 name = "syncserver-settings"
-version = "0.13.5"
+version = "0.13.6"
 dependencies = [
  "config 0.11.0",
  "num_cpus",
@@ -3159,7 +3159,7 @@ dependencies = [
 
 [[package]]
 name = "syncstorage-settings"
-version = "0.13.5"
+version = "0.13.6"
 dependencies = [
  "rand 0.8.5",
  "serde 1.0.135",
@@ -3339,7 +3339,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokenserver-common"
-version = "0.13.5"
+version = "0.13.6"
 dependencies = [
  "actix-web",
  "backtrace",
@@ -3352,7 +3352,7 @@ dependencies = [
 
 [[package]]
 name = "tokenserver-settings"
-version = "0.13.5"
+version = "0.13.6"
 dependencies = [
  "serde 1.0.135",
  "tokenserver-common",
diff --git a/syncserver-common/Cargo.toml b/syncserver-common/Cargo.toml
index a950a7d2..2ceb8e86 100644
--- a/syncserver-common/Cargo.toml
+++ b/syncserver-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-common"
-version = "0.13.5"
+version = "0.13.6"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver-db-common/Cargo.toml b/syncserver-db-common/Cargo.toml
index cca30178..23775087 100644
--- a/syncserver-db-common/Cargo.toml
+++ b/syncserver-db-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-db-common"
-version = "0.13.5"
+version = "0.13.6"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver-settings/Cargo.toml b/syncserver-settings/Cargo.toml
index 142b0a7d..3145ba09 100644
--- a/syncserver-settings/Cargo.toml
+++ b/syncserver-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver-settings"
-version = "0.13.5"
+version = "0.13.6"
 edition = "2021"
 
 [dependencies]
diff --git a/syncserver/Cargo.toml b/syncserver/Cargo.toml
index 8fe48ec1..916969e4 100644
--- a/syncserver/Cargo.toml
+++ b/syncserver/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncserver"
-version = "0.13.5"
+version = "0.13.6"
 license = "MPL-2.0"
 authors = [
   "Ben Bangert <ben@groovie.org>",
diff --git a/syncstorage-settings/Cargo.toml b/syncstorage-settings/Cargo.toml
index 47902491..97503404 100644
--- a/syncstorage-settings/Cargo.toml
+++ b/syncstorage-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "syncstorage-settings"
-version = "0.13.5"
+version = "0.13.6"
 edition = "2021"
 
 [dependencies]
diff --git a/tokenserver-common/Cargo.toml b/tokenserver-common/Cargo.toml
index 967ab827..6e924ac8 100644
--- a/tokenserver-common/Cargo.toml
+++ b/tokenserver-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokenserver-common"
-version = "0.13.5"
+version = "0.13.6"
 edition = "2021"
 
 [dependencies]
diff --git a/tokenserver-settings/Cargo.toml b/tokenserver-settings/Cargo.toml
index e5ea2232..ccacd23f 100644
--- a/tokenserver-settings/Cargo.toml
+++ b/tokenserver-settings/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tokenserver-settings"
-version = "0.13.5"
+version = "0.13.6"
 edition = "2021"
 
 [dependencies]

From e5058d26d41865ec8afff93b6323c7185b16dd80 Mon Sep 17 00:00:00 2001
From: Philip Jenvey <pjenvey@underboss.org>
Date: Tue, 7 Mar 2023 15:48:38 -0800
Subject: [PATCH 12/12] chore: pin back to master's versions of protobuf/chrono

they'll need some work to upgrade
---
 Cargo.lock | 120 +++--------------------------------------------------
 1 file changed, 5 insertions(+), 115 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 48c34c76..b3c9238b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -316,15 +316,6 @@ dependencies = [
  "alloc-no-stdlib",
 ]
 
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.69"
@@ -582,17 +573,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.23"
+version = "0.4.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f"
+checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
 dependencies = [
- "iana-time-zone",
- "js-sys",
+ "libc",
  "num-integer",
  "num-traits 0.2.15",
  "serde 1.0.153",
  "time 0.1.45",
- "wasm-bindgen",
  "winapi 0.3.9",
 ]
 
@@ -616,16 +605,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
-
 [[package]]
 name = "colored"
 version = "2.0.0"
@@ -808,50 +787,6 @@ dependencies = [
  "winapi 0.3.9",
 ]
 
-[[package]]
-name = "cxx"
-version = "1.0.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a140f260e6f3f79013b8bfc65e7ce630c9ab4388c6a89c71e07226f49487b72"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-build"
-version = "1.0.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da6383f459341ea689374bf0a42979739dc421874f112ff26f829b8040b8e613"
-dependencies = [
- "cc",
- "codespan-reporting",
- "once_cell",
- "proc-macro2",
- "quote",
- "scratch",
- "syn",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90201c1a650e95ccff1c8c0bb5a343213bdd317c6e600a93075bca2eff54ec97"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.92"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b75aed41bb2e6367cae39e6326ef817a851db13c13e4f3263714ca3cfb8de56"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "deadpool"
 version = "0.5.2"
@@ -1533,30 +1468,6 @@ dependencies = [
  "tokio-tls",
 ]
 
-[[package]]
-name = "iana-time-zone"
-version = "0.1.53"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca"
-dependencies = [
- "cxx",
- "cxx-build",
-]
-
 [[package]]
 name = "idna"
 version = "0.1.5"
@@ -1778,15 +1689,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "link-cplusplus"
-version = "1.0.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -2316,9 +2218,9 @@ dependencies = [
 
 [[package]]
 name = "protobuf"
-version = "2.28.0"
+version = "2.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "106dd99e98437432fed6519dedecfade6a06a73bb7b2a1e019fdd2bee5778d94"
+checksum = "47c327e191621a2158159df97cdbc2e7074bb4e940275e35abf38eb3d2595754"
 
 [[package]]
 name = "pyo3"
@@ -2684,12 +2586,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
-[[package]]
-name = "scratch"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1"
-
 [[package]]
 name = "sct"
 version = "0.6.1"
@@ -3828,12 +3724,6 @@ dependencies = [
  "tinyvec",
 ]
 
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.4"