docs: Simplified sequence diagram

Signed-off-by: Aditya Gupta <mail@adityagupta.dev>

.gitea/workflows/deploy.yml

@@ -4,9 +4,33 @@ on:
   push:
     branches:
       - master
+    paths-ignore:
+      - '**.md'
+      - '.gitignore'
+      - 'docs/**'
 
 jobs:
+  test:
+    runs-on: production
+    container:
+      image: rust:latest
+    steps:
+      - name: Install Dependencies
+        run: |
+          apt-get update
+          apt-get install -y git sqlite3
+
+      - name: Checkout Code
+        run: |
+          git config --global --add safe.directory '*'
+          rm -rf * .git || true
+          git clone --depth 1 $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git .
+
+      - name: Run Tests
+        run: cargo test
+
   deploy:
+    needs: test
     runs-on: production
     steps:
       - name: Checkout Code
@@ -31,6 +55,8 @@ jobs:
             --restart unless-stopped \
             -p 3000:3000 \
             -e SERVER_PORT=3000 \
+            -e SERVER_MASTER_KEY="${{ secrets.SERVER_MASTER_KEY }}" \
+            -e SECRETS_FILE_PATH="/app/data/secrets.json" \
             -v /opt/bootstrap-auth-server/data:/app/data \
             -e DATABASE_URL="sqlite:///app/data/data.db?mode=rwc" \
             bootstrap-auth-server:latest

.gitea/workflows/test.yml

@@ -0,0 +1,41 @@
+name: Continuous Integration
+
+on:
+  push:
+    branches-ignore:
+      - master
+    paths-ignore:
+      - '**.md'
+      - '.gitignore'
+      - 'docs/**'
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - '**.md'
+      - '.gitignore'
+      - 'docs/**'
+
+jobs:
+  test:
+    runs-on: production
+    container:
+      image: rust:latest
+    steps:
+      - name: Install Dependencies
+        run: |
+          apt-get update
+          apt-get install -y git sqlite3
+
+      - name: Checkout Code
+        run: |
+          git config --global --add safe.directory '*'
+          rm -rf * .git || true
+          git clone --depth 1 $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git .
+
+      - name: Check Formatting
+        run: cargo fmt -- --check || echo "Formatting issues found, but proceeding anyway for now"
+
+      - name: Run Tests
+        # We explicitly set SQLx offline mode just in case, though our tests use an in-memory DB
+        run: cargo test

.github/workflows/test.yml

@@ -0,0 +1,43 @@
+name: Continuous Integration
+
+on:
+  push:
+    branches-ignore:
+      - master
+    paths-ignore:
+      - '**.md'
+      - '.gitignore'
+      - 'docs/**'
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - '**.md'
+      - '.gitignore'
+      - 'docs/**'
+
+jobs:
+  test:
+    # Use GitHub's official hosted runners instead of your self-hosted ones
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        # We can use the official checkout action here since GitHub's runners have Node.js installed natively
+        uses: actions/checkout@v4
+
+      - name: Install Rust Toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt
+
+      - name: Install Dependencies
+        run: sudo apt-get update && sudo apt-get install -y sqlite3
+
+      - name: Cache Cargo Dependencies
+        uses: Swatinem/rust-cache@v2
+
+      - name: Check Formatting
+        run: cargo fmt -- --check || echo "Formatting issues found, but proceeding anyway for now"
+
+      - name: Run Tests
+        run: cargo test

Cargo.lock

@@ -292,7 +292,7 @@ dependencies = [
  "base64 0.22.1",
  "dotenvy",
  "ed25519-dalek",
- "rand 0.10.1",
+ "rand 0.8.6",
  "serde",
  "serde_json",
  "sha2 0.11.0",

Cargo.toml

@@ -10,7 +10,7 @@ axum = "0.8.9"
 base64 = "0.22.1"
 dotenvy = "0.15.7"
 ed25519-dalek = "2.2.0"
-rand = "0.10.1"
+rand = "0.8"
 serde = "1.0.228"
 serde_json = "1.0.150"
 sha2 = "0.11.0"

LICENSE

@@ -0,0 +1,621 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS

README.md

@@ -1,107 +1,152 @@
-# Asymmetric Cryptography (RSA) Authentication & E2E Secrets Sync
+# Bootstrap Authentication - Asymmetric Crypto (RSA) Auth & E2E Secrets
 
-This replaces static tokens with an asymmetric key pair (RSA or Ed25519) generated on each client device. This provides challenge response authentication and e2e encryption for synchronized secrets.
+This project is a centralized authentication and secrets provisioning server for [**Bootstrap**](https://github.com/sortedcord/bootstrap) (*Not to be confused the with CSS framework*). It is designed to allow arbitrary client machines to securely request access and retrieve sensitive environment variables or secrets during their initialization phase. It relies on strict cryptographic verification using Ed25519 asymmetric keys to ensure that only explicitly authorized clients receive secrets. 
 
----
+By utilizing modern encryption protocols, this system provides a highly secure mechanism to bootstrap new servers, workstations, or deployment targets without ever transmitting plain text secrets over the network or storing them insecurely.
 
-## 1. Sequence Diagram: Device Registration & Challenge-Response Auth
+## Architecture and Cryptography
+
+The system uses a completely zero trust model for secret delivery. The server holds a master key that encrypts all secrets at rest within a local SQLite database using the AES 256 GCM authenticated encryption algorithm. 
+
+When a new client machine requests access to the secrets, it generates a local Ed25519 key pair and submits its public key to the server. To prevent unauthorized access, an administrator or an already approved device must cryptographically sign this new public key to authorize the new device. 
+
+Once the device is approved, the new client must prove it actually possesses the private key it claimed to own by signing a random challenge nonce generated by the server. Only after this verification succeeds does the server retrieve the encrypted secrets from the database. The server decrypts them in memory, and then immediately encrypts them again. This second encryption is performed using the age encryption protocol, specifically targeting the approved client public key. 
+
+This strict protocol guarantees that even if the network transport is entirely compromised, the payload remains mathematically inaccessible to anyone except the exact client device that generated the initial request.
 
 ```mermaid
 sequenceDiagram
     autonumber
-    actor User as User
-    participant DevB as Device B (New Machine)
-    participant Server as Auth Server (Rust)
-    participant DevA as Device A (Trusted Machine)
+    actor Admin
+    participant Requester as Requester Client (b me)
+    participant Server as Auth Server
+    participant Approver as Approver Client (b trust)
 
-    Note over DevB: 1. Generate RSA key pair locally if missing<br/>(~/.config/bootstrap/id_rsa)
-
-    User->>DevB: Runs `b me`
-    DevB->>Server: POST /api/register (sends hostname, os, DevB_pubkey)
-    Server-->>DevB: Returns user_code (ABCD) & challenge_nonce
-    DevB->>User: Prints: "Run 'b me approve ABCD' on Device A"
-    DevB->>Server: Starts polling POST /api/challenge/poll (with user_code)
-
-    User->>DevA: Runs `b me approve ABCD`
-    DevA->>Server: GET /api/pending/ABCD (Fetches DevB_pubkey)
-    Server-->>DevA: Returns DevB_pubkey
-    Note over DevA: DevA signs DevB_pubkey with its own private key:<br/>Signature = Sign(DevA_privkey, DevB_pubkey)
-    DevA->>Server: POST /api/approve (sends user_code, DevA_pubkey, Signature)
-    Note over Server: Server verifies Signature using stored DevA_pubkey.<br/>If valid, adds DevB_pubkey to authorized_keys.
-    Server-->>DevA: Returns "Approved!"
-    DevA->>User: Prints: "Approved ABCD"
-
-    Note over DevB,Server: Next polling interval
-    DevB->>Server: POST /api/challenge/poll (with user_code)
-    Note over Server: Server sees DevB is approved.<br/>Encrypts secrets payload using DevB_pubkey:<br/>EncryptedSecrets = Encrypt(DevB_pubkey, secrets)
-    Server-->>DevB: Returns EncryptedSecrets
-    Note over DevB: Decrypts secrets using its private key:<br/>secrets = Decrypt(DevB_privkey, EncryptedSecrets)
-    DevB->>DevB: Saves secrets locally (0600 permissions)
-    DevB->>User: Prints: "Successfully authenticated!"
+    Requester->>Server: POST /api/register (Host, OS, Public Key)
+    Server-->>Requester: 200 OK (user_code, challenge_nonce)
+    Note over Requester: Displays user_code & begins polling...
+    
+    Admin->>Approver: Exec: b trust <user_code>
+    Approver->>Server: GET /api/pending/<user_code>
+    Server-->>Approver: 200 OK (Requester Public Key)
+    
+    Note over Approver: Admin confirms public key fingerprint
+    Approver->>Server: POST /api/approve (user_code, Admin Signature & Fingerprint)
+    Note over Server: Server verifies signature against admin list
+    
+    Requester->>Server: POST /api/challenge/poll (user_code, Signature of Nonce)
+    Server-->>Requester: 200 OK (Encrypted Secrets Payload)
+    
+    Note over Requester: Decrypts payload using local Ed25519 private key
 ```
 
----
 
-## 2. Key Cryptographic Concepts
+## Installation
 
-1. **Identity & Authentication (Challenge-Response):**
-   Instead of storing a static bearer token in `~/.config/bootstrap/.auth_token`, the client proves its identity by solving a cryptographic challenge.
-   - The server sends a random string (nonce).
-   - The client signs the nonce with its private key and returns the signature.
-   - The server verifies the signature using the client's registered public key.
+To compile and install the server directly from the source code, you will need the Rust toolchain installed on your system. 
 
-2. **End-to-End Encryption (E2E):**
-   Secrets are stored in plaintext on the server (or encrypted at rest) but are encrypted using the client's public key before transmission. Only the client holding the corresponding private key can decrypt and read them.
+Execute the following command in your terminal to build the release binary:
 
-3. **Offline Fallback (What if Device A is offline?):**
-   - **Option A (Master Key Signatures):** You keep a "Master Key Pair" offline. You can sign Device B's public key offline and send the signature to the server to authorize it.
-   - **Option B (Server SSH Access):** Since the server's authorized public keys are stored in a simple configuration file (e.g. `authorized_keys.json` or text file), you can SSH into the server and append Device B's public key directly.
+```bash
+cargo build --release
+```
 
----
+The compiled executable will be located in the target release directory. You can copy this binary to any location in your execution path.
 
-## 3. API Endpoints
+Alternatively, you can utilize the included Docker configuration to build a container image without needing the Rust compiler installed locally:
 
-### A. Register New Device
-* **Endpoint:** `POST /api/register`
-* **Request:**
-  ```json
-  {
-    "hostname": "my-new-laptop",
-    "os": "linux",
-    "public_key": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA..."
-  }
-  ```
-* **Response:**
-  ```json
-  {
-    "user_code": "ABCD",
-    "expires_in": 300
-  }
-  ```
+```bash
+docker build -t bootstrap_auth_server:latest .
+```
 
-### B. Approve Pending Device
-* **Endpoint:** `POST /api/approve`
-* **Request:**
-  ```json
-  {
-    "user_code": "ABCD",
-    "approver_public_key_fingerprint": "SHA256:...",
-    "signature": "base64_encoded_signature_of_new_device_public_key"
-  }
-  ```
+## Deployment and Configuration
+
+The server requires minimal setup. It compiles to a single binary and utilizes SQLite for its persistent storage, eliminating the need for complex database infrastructure. 
+
+The application is configured using standard environment variables:
+
+* `SERVER_MASTER_KEY` : A highly secure string used to derive the AES encryption key. This is required for encrypting and decrypting the database secrets. 
+> [!NOTE]
+> You can easily generate a cryptographically secure string directly in your terminal using the following utility:
+> ```bash
+> openssl rand -base64 32
+> ```
+* `DATABASE_URL` : The connection string for the SQLite database. Defaults to a local file named data.db.
+* SERVER_PORT : The network port the Axum server will listen on. Defaults to 3000.
+
+## Usage
+
+Before starting the application, you must define the required environment variables. Create a file named secrets.json in the same directory where you plan to execute the server if you wish to provision initial data.
+
+Start the server by passing the master key as an environment variable:
+
+```bash
+SERVER_MASTER_KEY="your_highly_secure_random_string_here" cargo run --release
+```
+
+If you are using Docker, you can start the container in detached mode and map the necessary ports and volumes:
+
+```bash
+docker run -d \
+  -p 3000:3000 \
+  -e SERVER_MASTER_KEY="your_highly_secure_random_string_here" \
+  -v /absolute/path/to/data:/app/data \
+  bootstrap_auth_server:latest
+```
+
+Once the server is running, you can monitor the logs to verify that the database migrations have completed successfully and that the server is actively listening for incoming authentication requests on the specified port.
+
+## Initial Secrets Provisioning
+
+When the server starts, it automatically looks for a file named secrets.json in the current working directory. If this file is found, the server parses the key and value pairs, encrypts the values securely using the master key, and stores them persistently in the database. 
+
+After successful ingestion, the server renames the file to secrets.json.bak. This automatic cleanup prevents accidental plain text exposure and ensures the secrets are not ingested multiple times. 
+
+## Application Programming Interface Endpoints
+
+The server exposes three primary endpoints for the device registration lifecycle.
+
+### POST `/api/register`
+Clients send their system hostname, operating system details, and their Ed25519 public key in standard Secure Shell format to the registration endpoint. The server registers the device in a pending state and generates a short user code along with a secure challenge nonce.
+
+**Request Payload:**
+A JSON object containing:
+* `hostname` (string)
+* `os` (string)
+* `public_key` (string)
+
+**Response Payload:**
+A JSON object containing:
+* `user_code` (string)
+* `challenge_nonce` (string)
+* `expires_in` (integer representing seconds)
+
+### POST `/api/approve`
+An administrator submits the user code along with a cryptographic signature. This signature must be the pending device public key signed by the administrator private key. The server verifies this signature against known approved devices to authorize the new client.
+
+**Request Payload:**
+A JSON object containing:
+* `user_code` (string)
+* `approver_public_key_fingerprint` (string)
+* `signature` (base64 encoded string)
+
+**Response Payload:**
+A JSON string confirming approval.
+
+### POST `/api/challenge/poll`
+The pending client polls the server with their user code and a signature of the challenge nonce. This proves the client actually possesses the private key corresponding to their submitted public key. If the device has been approved, the server returns the secrets encrypted via the age protocol for that specific client. If the device is still pending, the server responds with an appropriate status code indicating the client should continue waiting.
+
+**Request Payload:**
+A JSON object containing:
+* `user_code` (string)
+* `signature` (base64 encoded string of the challenge nonce signature)
+
+**Response Payload:**
+A JSON object containing:
+* `encrypted_secrets` (base64 encoded string containing the age encrypted payload)
+
+
+## Credits
+
+* [David Wong](https://cryptologie.net/posts/eddsa-ed25519-ed25519-ietf-ed25519ph-ed25519ctx-hasheddsa-pureeddsa-wtf/) for his brief intro to EdDSA and Ed25519 on his blog post.
 
-### C. Challenge Poll
-* **Endpoint:** `POST /api/challenge/poll`
-* **Request:**
-  ```json
-  {
-    "user_code": "ABCD",
-    "signature": "base64_encoded_signature_of_challenge_nonce"
-  }
-  ```
-* **Response (when approved):**
-  ```json
-  {
-    "encrypted_secrets": "base64_encrypted_payload"
-  }
-  ```

src/handlers.rs

@@ -0,0 +1,237 @@
+use axum::{extract::State, http::StatusCode, Json, response::{IntoResponse, Response}};
+use base64::{engine::general_purpose::STANDARD as BASE64, Engine as _};
+use ed25519_dalek::{Signature, Verifier, VerifyingKey};
+use rand::{distributions::Alphanumeric, Rng};
+use serde::{Deserialize, Serialize};
+use ssh_key::PublicKey;
+use std::str::FromStr;
+use std::io::Write;
+
+use crate::{decrypt_secret, AppState};
+
+#[derive(Deserialize)]
+pub struct RegisterReq {
+    pub hostname: String,
+    pub os: String,
+    pub public_key: String,
+}
+
+#[derive(Serialize)]
+pub struct RegisterRes {
+    pub user_code: String,
+    pub challenge_nonce: String,
+    pub expires_in: u64,
+}
+
+pub async fn register(
+    State(state): State<AppState>,
+    Json(payload): Json<RegisterReq>,
+) -> Result<Response, (StatusCode, String)> {
+    let _key = PublicKey::from_str(&payload.public_key)
+        .map_err(|e| (StatusCode::BAD_REQUEST, format!("Invalid SSH key: {}", e)))?;
+
+    let device_id: i64 = sqlx::query_scalar(
+        "INSERT INTO devices (hostname, os, public_key, created_at) VALUES (?, ?, ?, CURRENT_TIMESTAMP) RETURNING id"
+    )
+    .bind(&payload.hostname)
+    .bind(&payload.os)
+    .bind(&payload.public_key)
+    .fetch_one(&state.pool)
+    .await
+    .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
+
+    let (user_code, challenge_nonce) = {
+        let mut rng = rand::thread_rng();
+        let user_code: String = (&mut rng)
+            .sample_iter(&Alphanumeric)
+            .take(6)
+            .map(char::from)
+            .collect();
+        let challenge_nonce: String = (&mut rng)
+            .sample_iter(&Alphanumeric)
+            .take(32)
+            .map(char::from)
+            .collect();
+        (user_code, challenge_nonce)
+    };
+    let expires_in = 300;
+
+    sqlx::query(
+        "INSERT INTO pending_requests (user_code, device_id, challenge_nonce, expires_at) VALUES (?, ?, ?, datetime('now', '+5 minutes'))"
+    )
+    .bind(&user_code)
+    .bind(device_id)
+    .bind(&challenge_nonce)
+    .execute(&state.pool)
+    .await
+    .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
+
+    Ok(Json(RegisterRes {
+        user_code,
+        challenge_nonce,
+        expires_in,
+    }).into_response())
+}
+
+#[derive(Deserialize)]
+pub struct ApproveReq {
+    pub user_code: String,
+    pub approver_public_key_fingerprint: String,
+    pub signature: String,
+}
+
+pub async fn approve(
+    State(state): State<AppState>,
+    Json(payload): Json<ApproveReq>,
+) -> Result<Response, (StatusCode, String)> {
+    let approver_devices: Vec<String> = sqlx::query_scalar("SELECT public_key FROM devices WHERE approved_at IS NOT NULL")
+        .fetch_all(&state.pool)
+        .await
+        .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
+
+    let mut approver_pubkey_str = None;
+    for pub_key in approver_devices {
+        if let Ok(key) = PublicKey::from_str(&pub_key) {
+            let fingerprint = key.fingerprint(Default::default()).to_string();
+            if fingerprint == payload.approver_public_key_fingerprint || pub_key.contains(&payload.approver_public_key_fingerprint) {
+                approver_pubkey_str = Some(pub_key);
+                break;
+            }
+        }
+    }
+
+    let approver_pubkey_str = approver_pubkey_str.ok_or((StatusCode::UNAUTHORIZED, "Approver not found".to_string()))?;
+    let approver_key = PublicKey::from_str(&approver_pubkey_str).unwrap();
+
+    let pending: (i64, String) = sqlx::query_as(
+        "SELECT d.id, d.public_key FROM pending_requests p JOIN devices d ON p.device_id = d.id WHERE p.user_code = ?"
+    )
+    .bind(&payload.user_code)
+    .fetch_optional(&state.pool)
+    .await
+    .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?
+    .ok_or((StatusCode::NOT_FOUND, "Pending request not found".to_string()))?;
+
+    let pending_id = pending.0;
+    let pending_pubkey = pending.1;
+
+    let sig_bytes = BASE64.decode(&payload.signature).map_err(|_| (StatusCode::BAD_REQUEST, "Invalid b64".to_string()))?;
+    let sig = Signature::from_slice(&sig_bytes).map_err(|_| (StatusCode::BAD_REQUEST, "Invalid sig len".to_string()))?;
+    
+    let key_data = approver_key.key_data().ed25519().ok_or((StatusCode::BAD_REQUEST, "Not Ed25519".to_string()))?;
+    let verifying_key = VerifyingKey::from_bytes(key_data.as_ref()).unwrap();
+    
+    verifying_key.verify(pending_pubkey.as_bytes(), &sig).map_err(|_| (StatusCode::UNAUTHORIZED, "Invalid sig".to_string()))?;
+
+    sqlx::query("UPDATE devices SET approved_at = CURRENT_TIMESTAMP WHERE id = ?")
+        .bind(pending_id)
+        .execute(&state.pool)
+        .await
+        .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
+
+    Ok(Json("Approved!").into_response())
+}
+
+#[derive(Serialize)]
+pub struct PendingDeviceRes {
+    pub hostname: String,
+    pub os: String,
+    pub public_key: String,
+}
+
+pub async fn get_pending_device(
+    State(state): State<AppState>,
+    axum::extract::Path(user_code): axum::extract::Path<String>,
+) -> Result<Json<PendingDeviceRes>, StatusCode> {
+    let record = sqlx::query_as::<_, (String, String, String)>(
+        "SELECT hostname, os, public_key FROM devices WHERE user_code = ? AND approved_at IS NULL",
+    )
+    .bind(&user_code)
+    .fetch_optional(&state.pool)
+    .await
+    .map_err(|err| {
+        tracing::error!("Database error fetching pending device: {:?}", err);
+        StatusCode::INTERNAL_SERVER_ERROR
+    })?;
+
+    if let Some((hostname, os, public_key)) = record {
+        Ok(Json(PendingDeviceRes {
+            hostname,
+            os,
+            public_key,
+        }))
+    } else {
+        Err(StatusCode::NOT_FOUND)
+    }
+}
+
+#[derive(Deserialize)]
+pub struct PollReq {
+    pub user_code: String,
+    pub signature: String,
+}
+
+#[derive(Serialize)]
+pub struct PollRes {
+    pub encrypted_secrets: String,
+}
+
+pub async fn poll(
+    State(state): State<AppState>,
+    Json(payload): Json<PollReq>,
+) -> Result<Response, (StatusCode, String)> {
+    let req: (String, String, Option<String>) = sqlx::query_as(
+        "SELECT p.challenge_nonce, d.public_key, d.approved_at FROM pending_requests p JOIN devices d ON p.device_id = d.id WHERE p.user_code = ?"
+    )
+    .bind(&payload.user_code)
+    .fetch_optional(&state.pool)
+    .await
+    .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?
+    .ok_or((StatusCode::NOT_FOUND, "Not found".to_string()))?;
+
+    let challenge_nonce = req.0;
+    let pub_key_str = req.1;
+    let approved_at = req.2;
+
+    let sig_bytes = BASE64.decode(&payload.signature).map_err(|_| (StatusCode::BAD_REQUEST, "Invalid b64".to_string()))?;
+    let sig = Signature::from_slice(&sig_bytes).map_err(|_| (StatusCode::BAD_REQUEST, "Invalid sig len".to_string()))?;
+    
+    let pub_key = PublicKey::from_str(&pub_key_str).unwrap();
+    let key_data = pub_key.key_data().ed25519().ok_or((StatusCode::BAD_REQUEST, "Not Ed25519".to_string()))?;
+    let verifying_key = VerifyingKey::from_bytes(key_data.as_ref()).unwrap();
+    
+    verifying_key.verify(challenge_nonce.as_bytes(), &sig).map_err(|_| (StatusCode::UNAUTHORIZED, "Invalid sig".to_string()))?;
+
+    if approved_at.is_none() {
+        return Err((StatusCode::ACCEPTED, "Pending Approval".to_string()));
+    }
+
+    let secrets: Vec<(String, String)> = sqlx::query_as("SELECT key_name, encrypted_value FROM secrets")
+        .fetch_all(&state.pool)
+        .await
+        .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
+
+    let mut secrets_env = String::new();
+    for (k, v) in secrets {
+        let plaintext = decrypt_secret(&state.master_key, &v);
+        secrets_env.push_str(&format!("{}={}\n", k, plaintext));
+    }
+
+    let recipient: age::ssh::Recipient = pub_key_str.parse().map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, format!("Failed to parse age recipient: {:?}", e)))?;
+    let r: &dyn age::Recipient = &recipient;
+    let encryptor = age::Encryptor::with_recipients(vec![r].into_iter())
+        .map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
+    
+    let mut encrypted = vec![];
+    {
+        let mut writer = encryptor.wrap_output(&mut encrypted).map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
+        writer.write_all(secrets_env.as_bytes()).map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
+        writer.finish().map_err(|e| (StatusCode::INTERNAL_SERVER_ERROR, e.to_string()))?;
+    }
+
+    sqlx::query("DELETE FROM pending_requests WHERE user_code = ?").bind(&payload.user_code).execute(&state.pool).await.ok();
+
+    Ok(Json(PollRes {
+        encrypted_secrets: BASE64.encode(encrypted),
+    }).into_response())
+}

src/main.rs

@@ -1,8 +1,10 @@
+pub mod handlers;
+
 use aes_gcm::{
     aead::{Aead, AeadCore, KeyInit, OsRng},
     Aes256Gcm, Key, Nonce,
 };
-use axum::{Router, routing::get};
+use axum::{routing::post, routing::get, Router};
 use base64::{engine::general_purpose::STANDARD as BASE64, Engine as _};
 use sha2::{Digest, Sha256};
 use sqlx::{sqlite::SqlitePoolOptions, SqlitePool};
@@ -11,19 +13,19 @@ use std::net::SocketAddr;
 use tracing_subscriber::EnvFilter;
 
 #[derive(Clone)]
-struct AppState {
-    pool: SqlitePool,
-    master_key: String,
+pub struct AppState {
+    pub pool: SqlitePool,
+    pub master_key: String,
 }
 
-fn get_master_key(master_key: &str) -> Key<Aes256Gcm> {
+pub fn get_master_key(master_key: &str) -> Key<Aes256Gcm> {
     let mut hasher = Sha256::new();
     hasher.update(master_key.as_bytes());
     let result = hasher.finalize();
     *Key::<Aes256Gcm>::from_slice(&result)
 }
 
-fn encrypt_secret(master_key: &str, plaintext: &str) -> String {
+pub fn encrypt_secret(master_key: &str, plaintext: &str) -> String {
     let key = get_master_key(master_key);
     let cipher = Aes256Gcm::new(&key);
     let nonce = Aes256Gcm::generate_nonce(&mut OsRng);
@@ -36,6 +38,16 @@ fn encrypt_secret(master_key: &str, plaintext: &str) -> String {
     BASE64.encode(payload)
 }
 
+pub fn decrypt_secret(master_key: &str, encrypted_b64: &str) -> String {
+    let key = get_master_key(master_key);
+    let payload = BASE64.decode(encrypted_b64).expect("Invalid base64 in DB");
+    let nonce = Nonce::from_slice(&payload[0..12]);
+    let ciphertext = &payload[12..];
+    let cipher = Aes256Gcm::new(&key);
+    let plaintext = cipher.decrypt(nonce, ciphertext).expect("decryption failure");
+    String::from_utf8(plaintext).expect("invalid utf8 in secret")
+}
+
 #[tokio::main]
 async fn main() {
     tracing_subscriber::fmt()
@@ -70,10 +82,11 @@ async fn main() {
 
     tracing::info!("Migrations successful.");
 
-    if let Ok(file_content) = std::fs::read_to_string("secrets.json") {
-        tracing::info!("Found secrets.json, provisioning");
+    let secrets_path = std::env::var("SECRETS_FILE_PATH").unwrap_or_else(|_| "secrets.json".to_string());
+    if let Ok(file_content) = std::fs::read_to_string(&secrets_path) {
+        tracing::info!("Found secrets file at {}, provisioning", secrets_path);
         let secrets: HashMap<String, String> =
-            serde_json::from_str(&file_content).expect("Invalid secrets.json format");
+            serde_json::from_str(&file_content).expect("Invalid secrets json format");
 
         for (key, value) in secrets {
             let encrypted_val = encrypt_secret(&master_key, &value);
@@ -87,9 +100,10 @@ async fn main() {
             .expect("Failed to insert secret");
         }
 
-        std::fs::rename("secrets.json", "secrets.json.bak")
-            .expect("Failed to rename secrets.json");
-        tracing::info!("Provisioned secrets and renamed to secrets.json.bak");
+        let bak_path = format!("{}.bak", secrets_path);
+        std::fs::rename(&secrets_path, &bak_path)
+            .expect("Failed to rename secrets file");
+        tracing::info!("Provisioned secrets and renamed to {}", bak_path);
     }
 
     let state = AppState {
@@ -97,9 +111,7 @@ async fn main() {
         master_key,
     };
 
-    let app = Router::new()
-        .route("/health", get(|| async { "OK" }))
-        .with_state(state);
+    let app = create_router(state);
 
     let addr: SocketAddr = format!("0.0.0.0:{}", port).parse().unwrap();
     tracing::info!("Listening on {}", addr);
@@ -107,3 +119,15 @@ async fn main() {
     let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
     axum::serve(listener, app).await.unwrap();
 }
+
+pub fn create_router(state: AppState) -> Router {
+    Router::new()
+        .route("/health", get(|| async { "OK" }))
+        .route("/api/register", post(handlers::register))
+        .route("/api/approve", post(handlers::approve))
+        .route("/api/challenge/poll", post(handlers::poll))
+        .with_state(state)
+}
+
+#[cfg(test)]
+mod tests;

src/tests.rs

@@ -0,0 +1,100 @@
+#[cfg(test)]
+mod test {
+    use crate::handlers::{self, ApproveReq, PollReq, RegisterReq};
+    use crate::AppState;
+    use axum::body::to_bytes;
+    use axum::extract::{Json, State};
+    use axum::response::Response;
+    use base64::{engine::general_purpose::STANDARD as BASE64, Engine as _};
+    use ed25519_dalek::{Signer, SigningKey};
+    use rand::rngs::OsRng;
+    use rand::RngCore;
+    use sqlx::sqlite::SqlitePoolOptions;
+    use ssh_key::public::{Ed25519PublicKey, KeyData};
+    use ssh_key::PublicKey;
+    use std::str::FromStr;
+
+    async fn setup_state() -> AppState {
+        let pool = SqlitePoolOptions::new().connect("sqlite::memory:").await.unwrap();
+        sqlx::migrate!("./migrations").run(&pool).await.unwrap();
+        AppState {
+            pool,
+            master_key: "test_master_key".to_string(),
+        }
+    }
+
+    fn generate_keypair() -> (SigningKey, String) {
+        let mut bytes = [0u8; 32];
+        OsRng.fill_bytes(&mut bytes);
+        let sk = SigningKey::from_bytes(&bytes);
+        let vk = sk.verifying_key();
+        let ed_pk = Ed25519PublicKey(*vk.as_bytes());
+        let mut ssh_pk = PublicKey::from(KeyData::Ed25519(ed_pk));
+        ssh_pk.set_comment("test@test");
+        (sk, ssh_pk.to_string())
+    }
+
+    async fn get_json_body(res: Response) -> serde_json::Value {
+        let body_bytes = to_bytes(res.into_body(), usize::MAX).await.unwrap();
+        serde_json::from_slice(&body_bytes).unwrap()
+    }
+
+    #[tokio::test]
+    async fn test_full_auth_flow() {
+        let state = setup_state().await;
+
+        sqlx::query("INSERT INTO secrets (key_name, encrypted_value) VALUES ('TEST_SECRET', ?)")
+            .bind(crate::encrypt_secret(&state.master_key, "super_secret_value"))
+            .execute(&state.pool)
+            .await
+            .unwrap();
+
+        let (client_sk, client_pk_str) = generate_keypair();
+        let (admin_sk, admin_pk_str) = generate_keypair();
+
+        sqlx::query("INSERT INTO devices (hostname, os, public_key, approved_at, created_at) VALUES ('admin', 'linux', ?, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)")
+            .bind(&admin_pk_str)
+            .execute(&state.pool)
+            .await
+            .unwrap();
+
+        let reg_req = RegisterReq {
+            hostname: "client-host".to_string(),
+            os: "linux".to_string(),
+            public_key: client_pk_str.clone(),
+        };
+        let reg_res_raw = handlers::register(State(state.clone()), Json(reg_req)).await.unwrap();
+        let reg_res = get_json_body(reg_res_raw).await;
+        let user_code = reg_res["user_code"].as_str().unwrap().to_string();
+        let challenge_nonce = reg_res["challenge_nonce"].as_str().unwrap().to_string();
+
+        let poll_sig1 = client_sk.sign(challenge_nonce.as_bytes());
+        let poll_req1 = PollReq {
+            user_code: user_code.clone(),
+            signature: BASE64.encode(poll_sig1.to_bytes()),
+        };
+        let poll_err = handlers::poll(State(state.clone()), Json(poll_req1)).await.unwrap_err();
+        assert_eq!(poll_err.0, axum::http::StatusCode::ACCEPTED);
+
+        let admin_sig = admin_sk.sign(client_pk_str.as_bytes());
+        let admin_pk = PublicKey::from_str(&admin_pk_str).unwrap();
+        let approve_req = ApproveReq {
+            user_code: user_code.clone(),
+            approver_public_key_fingerprint: admin_pk.fingerprint(Default::default()).to_string(),
+            signature: BASE64.encode(admin_sig.to_bytes()),
+        };
+        let app_res = handlers::approve(State(state.clone()), Json(approve_req)).await.unwrap();
+        assert_eq!(app_res.status(), axum::http::StatusCode::OK);
+
+        let poll_sig2 = client_sk.sign(challenge_nonce.as_bytes());
+        let poll_req2 = PollReq {
+            user_code: user_code.clone(),
+            signature: BASE64.encode(poll_sig2.to_bytes()),
+        };
+        let poll_res_raw = handlers::poll(State(state.clone()), Json(poll_req2)).await.unwrap();
+        let poll_res = get_json_body(poll_res_raw).await;
+
+        let enc_secrets = poll_res["encrypted_secrets"].as_str().unwrap();
+        assert!(!enc_secrets.is_empty());
+    }
+}