database: store client_filter_flags as integer

Author: MrAnno

common/src/database/postgres.rs

@@ -218,7 +218,11 @@ fn row_to_subscription(row: &Row) -> Result<SubscriptionData> {
     let client_filter = match client_filter_op {
         Some(op) =>  {
             let client_filter_kind: Option<String> = row.try_get("client_filter_kind")?;
-            Some(ClientFilter::from(op, client_filter_kind.unwrap(), row.try_get("client_filter_flags")?, row.try_get("client_filter_targets")?)?)
+            let client_filter_flags: Option<i32> = row.try_get("client_filter_flags")?;
+            Some(
+                ClientFilter::from(op, client_filter_kind.unwrap(),
+                client_filter_flags.map(|c| c.try_into()).transpose()?, row.try_get("client_filter_targets")?)?
+            )
         },
         None => None
     };
@@ -632,7 +636,7 @@ impl Database for PostgresDatabase {
         let max_envelope_size: i32 = subscription.max_envelope_size().try_into()?;
         let client_filter_op: Option<String> = subscription.client_filter().map(|f| f.operation().to_string());
         let client_filter_kind = subscription.client_filter().map(|f| f.kind().to_string());
-        let client_filter_flags = subscription.client_filter().map(|f| f.flags().to_string());
+        let client_filter_flags: Option<i32> = subscription.client_filter().map(|f| f.flags().bits().try_into()).transpose()?;
         let client_filter_targets = subscription.client_filter().and_then(|f| f.targets_to_opt_string());
 
         let count = self

common/src/database/schema/postgres/_014_alter_client_filter_in_subscriptions.rs

@@ -20,7 +20,7 @@ impl PostgresMigration for AlterClientFilterInSubscriptionsTable {
         tx.execute("ALTER TABLE subscriptions ADD COLUMN client_filter_kind TEXT", &[]).await?;
         tx.execute("UPDATE subscriptions SET client_filter_kind = 'KerberosPrinc' WHERE client_filter_op IS NOT NULL", &[]).await?;
 
-        tx.execute("ALTER TABLE subscriptions ADD COLUMN client_filter_flags TEXT", &[]).await?;
+        tx.execute("ALTER TABLE subscriptions ADD COLUMN client_filter_flags INT4", &[]).await?;
         Ok(())
     }
 

common/src/database/schema/sqlite/_014_alter_client_filter_in_subscriptions.rs

@@ -23,7 +23,7 @@ impl SQLiteMigration for AlterClientFilterInSubscriptionsTable {
         conn.execute("UPDATE subscriptions SET client_filter_kind = 'KerberosPrinc' WHERE client_filter_op IS NOT NULL", [])
             .map_err(|err| anyhow!("SQLiteError: {}", err))?;
 
-        conn.execute("ALTER TABLE subscriptions ADD COLUMN client_filter_flags TEXT", [])
+        conn.execute("ALTER TABLE subscriptions ADD COLUMN client_filter_flags INTEGER", [])
             .map_err(|err| anyhow!("SQLiteError: {}", err))?;
         Ok(())
     }

common/src/database/sqlite.rs

@@ -557,7 +557,7 @@ impl Database for SQLiteDatabase {
         let subscription = subscription.clone();
         let client_filter_op: Option<String> = subscription.client_filter().map(|f| f.operation().to_string());
         let client_filter_kind = subscription.client_filter().map(|f| f.kind().to_string());
-        let client_filter_flags = subscription.client_filter().map(|f| f.flags().to_string());
+        let client_filter_flags = subscription.client_filter().map(|f| f.flags().bits());
         let client_filter_targets = subscription.client_filter().and_then(|f| f.targets_to_opt_string());
 
         let count = self

common/src/subscription.rs

@@ -6,7 +6,7 @@ use std::{
     str::FromStr,
 };
 
-use anyhow::{anyhow, bail, Result};
+use anyhow::{anyhow, bail, Context, Result};
 use log::{info, warn};
 use serde::{Deserialize, Serialize};
 use strum::{Display, AsRefStr, EnumString, IntoStaticStr, VariantNames};
@@ -340,8 +340,9 @@ impl ClientFilter {
         Ok(Self { operation, kind, flags, targets })
     }
 
-    pub fn from(operation: String, kind: String, flags: Option<String>, targets: Option<String>) -> Result<Self> {
-        let flags: ClientFilterFlags = bitflags::parser::from_str_strict(flags.unwrap_or_default().as_str()).map_err(|e| anyhow!("{:?}", e))?;
+    pub fn from(operation: String, kind: String, flags: Option<u32>, targets: Option<String>) -> Result<Self> {
+        let flags = flags.unwrap_or_default();
+        let flags = ClientFilterFlags::from_bits(flags).context("unknown bits are set in client filter flags")?;
 
         let mut clients = if flags.contains(ClientFilterFlags::GlobPattern) {
             ClientFilterTargets::Glob(Vec::new())
@@ -1201,7 +1202,7 @@ mod tests {
 
         let filter = ClientFilter::from(
             "only".to_string(), "TLSCertSubject".to_string(),
-            Some("GlobPattern | CaseInsensitive".to_string()), Some("target1,target2".to_string())
+            Some(0b11), Some("target1,target2".to_string())
         ).expect("couldn't construct client filter");
 
         assert_eq!(*filter.operation(), ClientFilterOperation::Only);