Merge branch 'main' into renovate/anyhow-1.x-lockfile

Unleash · Nov 25, 2024 · a18bf63 · a18bf63
2 parents 0005bd6 + 92c85db
commit a18bf63
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/server/src/builder.rs b/server/src/builder.rs
@@ -285,6 +285,10 @@ async fn build_edge(args: &EdgeArgs, app_name: &str) -> EdgeResult<EdgeInfo> {
         .await;
     }
 
+    if args.strict && token_cache.is_empty() {
+        error!("You started Edge in strict mode, but Edge was not able to validate any of the tokens configured at startup");
+        return Err(EdgeError::NoTokens("No valid tokens was provided on startup. At least one valid token must be specified at startup when running in Strict mode".into()));
+    }
     for validated_token in token_cache
         .iter()
         .filter(|candidate| candidate.value().token_type == Some(TokenType::Client))