update rsa

windmill-labs · Dec 15, 2024 · 820a454 · 820a454
1 parent 278ab4b
commit 820a454
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 121 deletions.
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -240,7 +240,7 @@ lazy_static = "1.4.0"
 serde_derive = "1.0.147"
 const_format = { version = "0.2", features = ["rust_1_64", "rust_1_51"] }
 dyn-iter = "0.2.0"
-rsa = "0.7.2"
+rsa = "^0"
 async-stripe = { version = "0.39.1", features = [
     "runtime-tokio-hyper",
     "checkout",

diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-6e8d5ca66c0912d3bbd0c3499d919854eafc5366
+1bed5d2a8b858fa345e2401721ddc90a5597280a
diff --git a/backend/windmill-api/src/auth.rs b/backend/windmill-api/src/auth.rs
@@ -1,3 +1,5 @@
+#[cfg(feature = "enterprise")]
+use crate::ee::ExternalJwks;
 use axum::{
     async_trait,
     extract::{FromRequestParts, OriginalUri, Query},
@@ -15,6 +17,9 @@ use std::sync::{
     atomic::{AtomicI64, AtomicU64, Ordering},
     Arc,
 };
+#[cfg(feature = "enterprise")]
+use tokio::sync::RwLock;
+
 use windmill_common::{
     auth::{get_folders_for_user, get_groups_for_user, JWTAuthClaims, JWT_SECRET},
     users::{COOKIE_NAME, SUPERADMIN_SECRET_EMAIL},

diff --git a/backend/windmill-api/src/users.rs b/backend/windmill-api/src/users.rs
@@ -14,8 +14,7 @@ use std::sync::Arc;
 use crate::db::ApiAuthed;
 
 pub use crate::auth::Tokened;
-#[cfg(feature = "enterprise")]
-use crate::ee::ExternalJwks;
+
 use crate::utils::{
     generate_instance_wide_unique_username, get_instance_username_or_create_pending,
 };
@@ -37,8 +36,6 @@ use regex::Regex;
 use serde::{Deserialize, Serialize};
 use sqlx::FromRow;
 use time::OffsetDateTime;
-#[cfg(feature = "enterprise")]
-use tokio::sync::RwLock;
 use tower_cookies::{Cookie, Cookies};
 use tracing::Instrument;
 use windmill_audit::audit_ee::{audit_log, AuditAuthor};
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		6e8d5ca66c0912d3bbd0c3499d919854eafc5366
		1bed5d2a8b858fa345e2401721ddc90a5597280a