chore: update build and dependencies

Author: bgwdotdev

.gitea/workflows/nix.yaml renamed to .forgejo/workflows/nix.yaml

@@ -1,33 +1,33 @@
 [package]
 name = "libre-oneroster"
-version = "0.2.0"
+version = "0.2.2"
 authors = ["fffnite <[email protected]>"]
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-surf = "2.2"
+surf = "2.3"
 tide = "0.16"
 tide-rustls = "0.3"
-async-std = { version = "1.9", features = ["attributes"] }
+async-std = { version = "1.13", features = ["attributes"] }
 futures = "0.3"
 chrono = { version = "0.4", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-serde_with = "3.0.0"
+serde_with = "3.0"
 log = "0.4"
-env_logger = "0.10.0"
-clap = { version = "4.3.4", features = [ "derive", "env" ] }
-sqlx = { version = "0.7.0-alpha.3", features = [ "sqlite", "runtime-async-std-native-tls", "chrono" ] }
-jsonwebtoken = "8.0.0-beta.0"
+env_logger = "0.11"
+clap = { version = "4.5", features = [ "derive", "env" ] }
+sqlx = { version = "0.8", features = [ "sqlite", "runtime-async-std-native-tls", "chrono" ] }
+jsonwebtoken = "9.3"
 openssl = "0.10"
-lazy_static = "1.4"
-uuid = { version = "1.3.4", features = [ "v4" ] }
+lazy_static = "1.5"
+uuid = { version = "1.16", features = [ "v4" ] }
 rand = { version = "0.8", features = [ "getrandom" ]}
 hex = "0.4"
-bcrypt = "0.14"
-http-types = "2.10"
+http-types = "2.12"
 jq-rs = "0.4"
-regex = "1.5"
-tiberius = { version = "0.12.2", features = [ "sql-browser-async-std" ] }
+regex = "1.11"
+tiberius = { version = "0.12", features = [ "sql-browser-async-std" ] }
+bcrypt = "0.17.0"

Cargo.lock

@@ -73,6 +73,13 @@ oneroster server -d myoneroster.db -j oneroster.pem -J oneroster.key.pem -w oner
 docker compose up
 ```
 
+### Logs
+
+logging level can be configured via the `RUST_LOG` environment variable
+
+```bash
+RUST_LOG=debug oneroster server --init ...
+```
 
 ## Client 
 

Cargo.toml

@@ -1,7 +1,6 @@
 services:
   oneroster:
-    #image: git.bgw.dev/bgw/libre-oneroster:0.2.0
-    image: localhost/libre-oneroster:0.2.0
+    image: ghcr.io/bgwdotdev/libre-oneroster:0.2.2
     ports:
       - "8080:8080"
     volumes:

README.md

@@ -1,98 +1,73 @@
 INSERT
-    OR IGNORE INTO scopes (
-        scope)
-    VALUES (
-        'roster-core.readonly')
-    , (
-        'roster-core.createput')
-    , (
-        'admin.readonly');
+    OR IGNORE INTO scopes (scope) VALUES
+    ('roster-core.readonly')
+    , ('roster-core.createput')
+    , ('admin.readonly')
+    ;
 
 INSERT
-    OR IGNORE INTO StatusType (
-        token)
-    VALUES (
-        'active')
-    , (
-        'tobedeleted')
-    , (
-        'inactive');
+    OR IGNORE INTO StatusType (token) VALUES
+    ('active')
+    , ('tobedeleted')
+    , ('inactive')
+    ;
 
 INSERT
-    OR IGNORE INTO OrgType (
-        token)
-    VALUES (
-        'department')
-    , (
-        'school')
-    , (
-        'district')
-    , (
-        'local')
-    , (
-        'state')
-    , (
-        'national');
+    OR IGNORE INTO OrgType (token) VALUES
+    ('department')
+    , ('school')
+    , ('district')
+    , ('local')
+    , ('state')
+    , ('national')
+    ;
 
 INSERT
-    OR IGNORE INTO ClassType (
-        token)
-    VALUES (
-        'homeroom')
-    , (
-        'scheduled');
+    OR IGNORE INTO ClassType (token) VALUES
+    ('homeroom')
+    , ('scheduled');
 
 INSERT
-    OR IGNORE INTO RoleType (
-        token)
-    VALUES (
-        'administrator')
-    , (
-        'aide')
-    , (
-        'guardian')
-    , (
-        'parent')
-    , (
-        'proctor')
-    , (
-        'relative')
-    , (
-        'student')
-    , (
-        'teacher');
+    OR IGNORE INTO RoleType (token) VALUES
+    ('administrator')
+    , ('aide')
+    , ('guardian')
+    , ('parent')
+    , ('proctor')
+    , ('relative')
+    , ('student')
+    , ('teacher')
+    ;
 
 INSERT
-    OR IGNORE INTO SessionType (
-        token)
-    VALUES (
-        'gradingPeriod')
-    , (
-        'semester')
-    , (
-        'schoolYear')
-    , (
-        'term');
+    OR IGNORE INTO SessionType (token) VALUES
+    ('gradingPeriod')
+    , ('semester')
+    , ('schoolYear')
+    , ('term')
+    ;
 
-INSERT OR IGNORE INTO GradeType (token, description) VALUES 
-    ('IT', 'Infant/toddler'),
-    ('PR', 'Preschool'),
-    ('PK', 'Prekindergarten'),
-    ('TK', 'Transitional Kindergarten'),
-    ('KG', 'Kindergarten'),
-    ('01', 'First grade'),
-    ('02', 'Second grade'),
-    ('03', 'Third grade'),
-    ('04', 'Fourth grade'),
-    ('05', 'Fifth grade'),
-    ('06', 'Sixth grade'),
-    ('07', 'Seventh grade'),
-    ('08', 'Eigth grade'),
-    ('09', 'Ninth grade'),
-    ('10', 'Tenth grade'),
-    ('11', 'Eleventh grade'),
-    ('12', 'Twelfth grade'),
-    ('13', 'Grade 13'),
-    ('PS', 'Postsecondary'),
-    ('UG', 'Ungraded'),
-    ('Other', 'Other');
+INSERT
+    OR IGNORE INTO GradeType (token, description) VALUES
+    ('IT', 'Infant/toddler')
+    , ('PR', 'Preschool')
+    , ('PK', 'Prekindergarten')
+    , ('TK', 'Transitional Kindergarten')
+    , ('KG', 'Kindergarten')
+    , ('01', 'First grade')
+    , ('02', 'Second grade')
+    , ('03', 'Third grade')
+    , ('04', 'Fourth grade')
+    , ('05', 'Fifth grade')
+    , ('06', 'Sixth grade')
+    , ('07', 'Seventh grade')
+    , ('08', 'Eigth grade')
+    , ('09', 'Ninth grade')
+    , ('10', 'Tenth grade')
+    , ('11', 'Eleventh grade')
+    , ('12', 'Twelfth grade')
+    , ('13', 'Grade 13')
+    , ('PS', 'Postsecondary')
+    , ('UG', 'Ungraded')
+    , ('Other', 'Other')
+    ;

compose.yml

@@ -17,18 +17,19 @@
         name = cargoToml.package.name;
       in
       rec {
-        devShell = pkgs.mkShell {
+        devShells.default = pkgs.mkShell {
           packages = with pkgs; [
             cargo
             rustc
             rust-analyzer
-            jq.lib
+            rustfmt
+            jq
             openssl.dev
             sqlite
             oniguruma
-            pkgconfig
+            pkg-config
           ];
-          JQ_LIB_DIR = "${pkgs.jq.lib}";
+          JQ_LIB_DIR = "${pkgs.jq}";
           DATABASE_URL = "sqlite:db/oneroster.db";
           shellHook = ''
             if [ ! -f db/oneroster.db ]; then
@@ -45,20 +46,20 @@
           src = ./.;
           cargoLock.lockFile = ./Cargo.lock;
           nativeBuildInputs = [
-            pkgs.pkgconfig
+            pkgs.pkg-config
             pkgs.openssl.dev
             pkgs.sqlite
           ];
           buildInputs = [
-            pkgs.jq.lib
+            pkgs.jq
             pkgs.oniguruma
           ];
           preConfigure = ''
             sqlite3 db/oneroster.db < db/schema.sql
             sqlite3 db/oneroster.db < db/init.sql
           '';
           doCheck = false;
-          JQ_LIB_DIR = "${pkgs.jq.lib}";
+          JQ_LIB_DIR = "${pkgs.jq}";
           DATABASE_URL = "sqlite:db/oneroster.db";
           PKG_CONFIG_PATH = "${pkgs.openssl.dev}/lib/pkgconfig";
         };

db/init.sql

@@ -3,14 +3,14 @@ mod db;
 pub mod errors;
 mod params;
 
+use async_std::prelude::*;
 pub use errors::*;
 use http_types::mime;
 use std::io::prelude::*;
 use tide::prelude::*;
 use tide::utils::After;
 use tide::Request;
 use tide_rustls::TlsListener;
-use async_std::prelude::*;
 
 type Result<T> = std::result::Result<T, ServerError>;
 

flake.lock

@@ -5,7 +5,6 @@ use tide::prelude::*;
 
 #[derive(Debug, Deserialize, Serialize)]
 pub(crate) struct Claims {
-    aud: String,
     exp: u64,
     sub: String,
     pub(crate) scope: String,
@@ -33,7 +32,6 @@ pub(crate) async fn create_token(
     let exp = SystemTime::now().duration_since(std::time::UNIX_EPOCH)?
         + std::time::Duration::from_secs(exp_in);
     let claims = Claims {
-        aud: "localhost".to_string(),
         exp: exp.as_secs(),
         sub: id,
         scope: scope.clone(),
@@ -65,6 +63,9 @@ pub(crate) async fn validate_token(token: String, key: &jsonwebtoken::DecodingKe
             log::debug!("validated:\n{:?}", t);
             true
         }
-        Err(_) => false,
+        Err(e) => {
+            log::debug!("invalid: {e}");
+            false
+        }
     }
 }