Merge pull request #2630 from golemcloud/code-first-routes-cors

code-first-routes: cors support

Author: mschuwalow

Cargo.lock

@@ -145,6 +145,7 @@ combine = "4.6.7"
 conditional-trait-gen = "0.4.1"
 console-subscriber = "0.4.1"
 convert_case = "0.8.0"
+cookie = "0.18.1"
 criterion = "0.5"
 crossterm = "0.28.1"
 darling = "0.20.11"

Cargo.toml

@@ -292,7 +292,7 @@ impl ApiDeploymentCommandHandler {
         &self,
         http_api_deployment: &DeploymentPlanHttpApiDeploymentEntry,
         deployable_http_api_deployment: &[HttpApiDefinitionName],
-        _diff: &diff::DiffForHashOf<diff::HttpApiDeployment>,
+        _diff: &diff::DiffForHashOf<diff::HttpApiDeploymentLegacy>,
     ) -> anyhow::Result<()> {
         log_action(
             "Updating",

cli/golem-cli/src/command_handler/api/deployment.rs

@@ -759,11 +759,11 @@ impl AppCommandHandler {
 
         let diffable_local_http_api_deployments = {
             let mut diffable_local_http_api_deployments =
-                BTreeMap::<String, diff::HashOf<diff::HttpApiDeployment>>::new();
+                BTreeMap::<String, diff::HashOf<diff::HttpApiDeploymentLegacy>>::new();
             for (domain, http_api_deployment) in &deployable_manifest_http_api_deployments {
                 diffable_local_http_api_deployments.insert(
                     domain.0.clone(),
-                    diff::HttpApiDeployment {
+                    diff::HttpApiDeploymentLegacy {
                         agent_types: http_api_deployment
                             .iter()
                             .map(|def| def.0.clone())

cli/golem-cli/src/command_handler/app/mod.rs

@@ -40,7 +40,9 @@ use golem_worker_executor::services::golem_config::{
     KeyValueStorageMultiSqliteConfig, ResourceLimitsConfig, ResourceLimitsGrpcConfig,
     ShardManagerServiceConfig, ShardManagerServiceGrpcConfig, WorkerServiceGrpcConfig,
 };
-use golem_worker_service::config::{RouteResolverConfig, WorkerServiceConfig};
+use golem_worker_service::config::{
+    RouteResolverConfig, SqliteSessionStoreConfig, WorkerServiceConfig,
+};
 use golem_worker_service::WorkerService;
 use opentelemetry::global;
 use opentelemetry_sdk::metrics::MeterProviderBuilder;
@@ -325,18 +327,21 @@ fn worker_service_config(
             port: 0,
             ..Default::default()
         },
-        gateway_session_storage: golem_worker_service::config::GatewaySessionStorageConfig::Sqlite(
-            DbSqliteConfig {
-                database: args
-                    .data_dir
-                    .join("gateway-sessions.db")
-                    .to_string_lossy()
-                    .to_string(),
-                max_connections: 4,
-                foreign_keys: false,
+        gateway_session_storage: golem_worker_service::config::SessionStoreConfig::Sqlite(
+            SqliteSessionStoreConfig {
+                pending_login_expiration: Duration::from_hours(1),
+                cleanup_interval: Duration::from_mins(5),
+                sqlite_config: DbSqliteConfig {
+                    database: args
+                        .data_dir
+                        .join("gateway-sessions.db")
+                        .to_string_lossy()
+                        .to_string(),
+                    max_connections: 4,
+                    foreign_keys: false,
+                },
             },
         ),
-        blob_storage: blob_storage_config(args),
         routing_table: RoutingTableConfig {
             host: args.router_addr.clone(),
             port: shard_manager_run_details.grpc_port,

cli/golem/src/launch.rs

@@ -163,12 +163,13 @@ message CompiledRoute {
   RequestBodySchema body = 4;
   RouteBehaviour behavior = 5;
   optional golem.registry.SecuritySchemeId security_scheme = 6;
-  golem.component.CorsOptions cors = 7;
+  CorsOptions cors = 7;
 }
 
 message RouteBehaviour {
   oneof kind {
     CallAgent call_agent = 1;
+    CorsPreflight cors_preflight = 2;
   }
 
   message CallAgent {
@@ -181,6 +182,11 @@ message RouteBehaviour {
     repeated MethodParameter method_parameters = 7;
     golem.component.DataSchema expected_agent_response = 8;
   }
+
+  message CorsPreflight {
+    repeated string allowed_origins = 1;
+    repeated golem.component.HttpMethod allowed_methods = 2;
+  }
 }
 
 message SecuritySchemeDetails {
@@ -192,3 +198,7 @@ message SecuritySchemeDetails {
   string redirect_url = 6;
   repeated string scopes = 7;
 }
+
+message CorsOptions {
+  repeated string allowed_patterns = 1;
+}

golem-api-grpc/proto/golem/customapi/core.proto

@@ -737,7 +737,9 @@ pub struct HttpEndpointDetails {
     pub cors_options: CorsOptions,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, IntoValue, FromValue)]
+#[derive(
+    Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize, IntoValue, FromValue,
+)]
 #[cfg_attr(
     feature = "full",
     derive(desert_rust::BinaryCodec, poem_openapi::Union)
@@ -790,7 +792,9 @@ impl TryFrom<HttpMethod> for http::Method {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, IntoValue, FromValue)]
+#[derive(
+    Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize, IntoValue, FromValue,
+)]
 #[cfg_attr(
     feature = "full",
     derive(desert_rust::BinaryCodec, poem_openapi::Object)

golem-common/src/base_model/agent.rs

@@ -12,27 +12,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use super::security_scheme::SecuritySchemeName;
 use crate::base_model::agent::AgentTypeName;
 use crate::base_model::diff;
 use crate::base_model::domain_registration::Domain;
 use crate::base_model::environment::EnvironmentId;
 use crate::{declare_revision, declare_structs, newtype_uuid};
 use chrono::DateTime;
-use std::collections::BTreeSet;
+use std::collections::BTreeMap;
 
 newtype_uuid!(HttpApiDeploymentId);
 
 declare_revision!(HttpApiDeploymentRevision);
 
 declare_structs! {
+    #[derive(Default)]
+    #[cfg_attr(feature = "full", derive(desert_rust::BinaryCodec))]
+    #[cfg_attr(feature = "full", desert(transparent))]
+    pub struct HttpApiDeploymentAgentOptions {
+        /// Security scheme to use for all agent methods that require auth.
+        /// Failure to provide a security scheme for an agent that requires one will lead to a deployment failure.
+        /// If the requested security scheme does not exist in the environment, the route will be disabled at runtime.
+        pub security_scheme: Option<SecuritySchemeName>
+    }
+
     pub struct HttpApiDeploymentCreation {
         pub domain: Domain,
-        pub agent_types: BTreeSet<AgentTypeName>
+        pub agents: BTreeMap<AgentTypeName, HttpApiDeploymentAgentOptions>
     }
 
     pub struct HttpApiDeploymentUpdate {
         pub current_revision: HttpApiDeploymentRevision,
-        pub agent_types: Option<BTreeSet<AgentTypeName>>
+        pub agents: Option<BTreeMap<AgentTypeName, HttpApiDeploymentAgentOptions>>
     }
 
     pub struct HttpApiDeployment {
@@ -41,7 +52,7 @@ declare_structs! {
         pub environment_id: EnvironmentId,
         pub domain: Domain,
         pub hash: diff::Hash,
-        pub agent_types: BTreeSet<AgentTypeName>,
+        pub agents: BTreeMap<AgentTypeName, HttpApiDeploymentAgentOptions>,
         pub created_at: DateTime<chrono::Utc>,
     }
 }

golem-common/src/base_model/http_api_deployment.rs

@@ -157,7 +157,7 @@ impl FromValue for Timestamp {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize, Default)]
 #[cfg_attr(
     feature = "full",
     derive(desert_rust::BinaryCodec, poem_openapi::Object)

golem-common/src/base_model/mod.rs

@@ -15,7 +15,7 @@
 use crate::model::diff::component::Component;
 use crate::model::diff::hash::{hash_from_serialized_value, Hash, HashOf, Hashable};
 use crate::model::diff::http_api_definition::HttpApiDefinition;
-use crate::model::diff::http_api_deployment::HttpApiDeployment;
+use crate::model::diff::http_api_deployment::HttpApiDeploymentLegacy;
 use crate::model::diff::ser::serialize_with_mode;
 use crate::model::diff::{BTreeMapDiff, Diffable};
 use serde::Serialize;
@@ -32,7 +32,7 @@ pub struct Deployment {
     pub http_api_definitions: BTreeMap<String, HashOf<HttpApiDefinition>>,
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
     #[serde(serialize_with = "serialize_with_mode")]
-    pub http_api_deployments: BTreeMap<String, HashOf<HttpApiDeployment>>,
+    pub http_api_deployments: BTreeMap<String, HashOf<HttpApiDeploymentLegacy>>,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize)]
@@ -43,7 +43,7 @@ pub struct DeploymentDiff {
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
     pub http_api_definitions: BTreeMapDiff<String, HashOf<HttpApiDefinition>>,
     #[serde(skip_serializing_if = "BTreeMap::is_empty")]
-    pub http_api_deployments: BTreeMapDiff<String, HashOf<HttpApiDeployment>>,
+    pub http_api_deployments: BTreeMapDiff<String, HashOf<HttpApiDeploymentLegacy>>,
 }
 
 impl Diffable for Deployment {