move user configuration to pbs_config workspace

Also moved memcom.rs and cached_user_info.rs

src/api2/access/acl.rs

@@ -12,7 +12,7 @@ use pbs_api_types::{
 
 use pbs_config::acl::AclTreeNode;
 
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 
 fn extract_acl_node_data(
     node: &AclTreeNode,
@@ -221,7 +221,7 @@ pub fn update_acl(
         bail!("parameter 'group' - groups are currently not supported.");
     } else if let Some(ref auth_id) = auth_id {
         if !delete { // Note: we allow to delete non-existent users
-            let user_cfg = crate::config::user::cached_config()?;
+            let user_cfg = pbs_config::user::cached_config()?;
             if user_cfg.sections.get(&auth_id.to_string()).is_none() {
                 bail!(format!("no such {}.",
                               if auth_id.is_token() { "API token" } else { "user" }));

src/api2/access/mod.rs

@@ -22,7 +22,7 @@ use pbs_config::acl::AclTreeNode;
 use crate::auth_helpers::*;
 use crate::server::ticket::ApiTicket;
 
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 use crate::config::tfa::TfaChallenge;
 
 pub mod acl;

src/api2/access/openid.rs

@@ -19,7 +19,7 @@ use pbs_tools::ticket::Ticket;
 use pbs_config::domains::{OpenIdUserAttribute, OpenIdRealmConfig};
 
 use crate::server::ticket::ApiTicket;
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 
 use pbs_config::open_backup_lockfile;
 
@@ -116,7 +116,7 @@ pub fn openid_login(
 
     if !user_info.is_active_user_id(&user_id) {
         if config.autocreate.unwrap_or(false) {
-            use crate::config::user;
+            use pbs_config::user;
             let _lock = open_backup_lockfile(user::USER_CFG_LOCKFILE, None, true)?;
             let user = User {
                 userid: user_id.clone(),

src/api2/access/tfa.rs

@@ -9,7 +9,7 @@ use proxmox::{http_bail, http_err};
 
 use pbs_api_types::{Authid, Userid, User, PASSWORD_SCHEMA, PRIV_PERMISSIONS_MODIFY, PRIV_SYS_AUDIT};
 
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 use crate::config::tfa::{TfaInfo, TfaUserData};
 
 /// Perform first-factor (password) authentication only. Ignore password for the root user.
@@ -34,7 +34,7 @@ fn tfa_update_auth(
 
     // After authentication, verify that the to-be-modified user actually exists:
     if must_exist && authid.user() != userid {
-        let (config, _digest) = crate::config::user::config()?;
+        let (config, _digest) = pbs_config::user::config()?;
 
         if config
             .lookup::<User>("user", userid.as_str())

src/api2/access/user.rs

@@ -16,7 +16,7 @@ use pbs_api_types::{
 };
 use pbs_config::token_shadow;
 
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 
 fn new_user_with_tokens(user: User) -> UserWithTokens {
     UserWithTokens {
@@ -59,7 +59,7 @@ pub fn list_users(
     mut rpcenv: &mut dyn RpcEnvironment,
 ) -> Result<Vec<UserWithTokens>, Error> {
 
-    let (config, digest) = crate::config::user::config()?;
+    let (config, digest) = pbs_config::user::config()?;
 
     let auth_id: Authid = rpcenv
         .get_auth_id()
@@ -138,9 +138,9 @@ pub fn create_user(
     rpcenv: &mut dyn RpcEnvironment
 ) -> Result<(), Error> {
 
-    let _lock = crate::config::user::lock_config()?;
+    let _lock = pbs_config::user::lock_config()?;
 
-    let (mut section_config, _digest) = crate::config::user::config()?;
+    let (mut section_config, _digest) = pbs_config::user::config()?;
 
     if section_config.sections.get(config.userid.as_str()).is_some() {
         bail!("user '{}' already exists.", config.userid);
@@ -153,7 +153,7 @@ pub fn create_user(
     // Fails if realm does not exist!
     let authenticator = crate::auth::lookup_authenticator(realm)?;
 
-    crate::config::user::save_config(&section_config)?;
+    pbs_config::user::save_config(&section_config)?;
 
     if let Some(password) = password {
         let user_info = CachedUserInfo::new()?;
@@ -185,7 +185,7 @@ pub fn create_user(
 )]
 /// Read user configuration data.
 pub fn read_user(userid: Userid, mut rpcenv: &mut dyn RpcEnvironment) -> Result<User, Error> {
-    let (config, digest) = crate::config::user::config()?;
+    let (config, digest) = pbs_config::user::config()?;
     let user = config.lookup("user", userid.as_str())?;
     rpcenv["digest"] = proxmox::tools::digest_to_hex(&digest).into();
     Ok(user)
@@ -253,9 +253,9 @@ pub fn update_user(
     rpcenv: &mut dyn RpcEnvironment,
 ) -> Result<(), Error> {
 
-    let _lock = crate::config::user::lock_config()?;
+    let _lock = pbs_config::user::lock_config()?;
 
-    let (mut config, expected_digest) = crate::config::user::config()?;
+    let (mut config, expected_digest) = pbs_config::user::config()?;
 
     if let Some(ref digest) = digest {
         let digest = proxmox::tools::hex_to_digest(digest)?;
@@ -317,7 +317,7 @@ pub fn update_user(
 
     config.set_data(userid.as_str(), "user", &data)?;
 
-    crate::config::user::save_config(&config)?;
+    pbs_config::user::save_config(&config)?;
 
     Ok(())
 }
@@ -345,10 +345,10 @@ pub fn update_user(
 /// Remove a user from the configuration file.
 pub fn delete_user(userid: Userid, digest: Option<String>) -> Result<(), Error> {
 
-    let _lock = crate::config::user::lock_config()?;
+    let _lock = pbs_config::user::lock_config()?;
     let _tfa_lock = crate::config::tfa::write_lock()?;
  
-    let (mut config, expected_digest) = crate::config::user::config()?;
+    let (mut config, expected_digest) = pbs_config::user::config()?;
 
     if let Some(ref digest) = digest {
         let digest = proxmox::tools::hex_to_digest(digest)?;
@@ -360,7 +360,7 @@ pub fn delete_user(userid: Userid, digest: Option<String>) -> Result<(), Error>
         None => bail!("user '{}' does not exist.", userid),
     }
 
-    crate::config::user::save_config(&config)?;
+    pbs_config::user::save_config(&config)?;
 
     let authenticator = crate::auth::lookup_authenticator(userid.realm())?;
     match authenticator.remove_password(userid.name()) {
@@ -416,7 +416,7 @@ pub fn read_token(
     mut rpcenv: &mut dyn RpcEnvironment,
 ) -> Result<ApiToken, Error> {
 
-    let (config, digest) = crate::config::user::config()?;
+    let (config, digest) = pbs_config::user::config()?;
 
     let tokenid = Authid::from((userid, Some(tokenname)));
 
@@ -482,9 +482,9 @@ pub fn generate_token(
     digest: Option<String>,
 ) -> Result<Value, Error> {
 
-    let _lock = crate::config::user::lock_config()?;
+    let _lock = pbs_config::user::lock_config()?;
 
-    let (mut config, expected_digest) = crate::config::user::config()?;
+    let (mut config, expected_digest) = pbs_config::user::config()?;
 
     if let Some(ref digest) = digest {
         let digest = proxmox::tools::hex_to_digest(digest)?;
@@ -510,7 +510,7 @@ pub fn generate_token(
 
     config.set_data(&tokenid_string, "token", &token)?;
 
-    crate::config::user::save_config(&config)?;
+    pbs_config::user::save_config(&config)?;
 
     Ok(json!({
         "tokenid": tokenid_string,
@@ -563,9 +563,9 @@ pub fn update_token(
     digest: Option<String>,
 ) -> Result<(), Error> {
 
-    let _lock = crate::config::user::lock_config()?;
+    let _lock = pbs_config::user::lock_config()?;
 
-    let (mut config, expected_digest) = crate::config::user::config()?;
+    let (mut config, expected_digest) = pbs_config::user::config()?;
 
     if let Some(ref digest) = digest {
         let digest = proxmox::tools::hex_to_digest(digest)?;
@@ -596,7 +596,7 @@ pub fn update_token(
 
     config.set_data(&tokenid_string, "token", &data)?;
 
-    crate::config::user::save_config(&config)?;
+    pbs_config::user::save_config(&config)?;
 
     Ok(())
 }
@@ -631,9 +631,9 @@ pub fn delete_token(
     digest: Option<String>,
 ) -> Result<(), Error> {
 
-    let _lock = crate::config::user::lock_config()?;
+    let _lock = pbs_config::user::lock_config()?;
 
-    let (mut config, expected_digest) = crate::config::user::config()?;
+    let (mut config, expected_digest) = pbs_config::user::config()?;
 
     if let Some(ref digest) = digest {
         let digest = proxmox::tools::hex_to_digest(digest)?;
@@ -650,7 +650,7 @@ pub fn delete_token(
 
     token_shadow::delete_secret(&tokenid)?;
 
-    crate::config::user::save_config(&config)?;
+    pbs_config::user::save_config(&config)?;
 
     Ok(())
 }
@@ -682,7 +682,7 @@ pub fn list_tokens(
     mut rpcenv: &mut dyn RpcEnvironment,
 ) -> Result<Vec<ApiToken>, Error> {
 
-    let (config, digest) = crate::config::user::config()?;
+    let (config, digest) = pbs_config::user::config()?;
 
     let list:Vec<ApiToken> = config.convert_to_typed_array("token")?;
 

src/api2/admin/datastore.rs

@@ -58,7 +58,7 @@ use crate::backup::{
     DataStore, LocalChunkReader,
 };
 use crate::config::datastore;
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 
 use crate::server::{jobstate::Job, WorkerTask};
 

src/api2/admin/sync.rs

@@ -9,6 +9,7 @@ use proxmox::{list_subdirs_api_method, sortable};
 
 use pbs_api_types::{DATASTORE_SCHEMA, JOB_ID_SCHEMA, Authid, SyncJobConfig, SyncJobStatus};
 use pbs_config::sync;
+use pbs_config::CachedUserInfo;
 
 use crate::{
     api2::{
@@ -18,9 +19,6 @@ use crate::{
             check_sync_job_read_access,
         },
     },
-    config::{
-        cached_user_info::CachedUserInfo,
-    },
     server::{
         jobstate::{
             Job,

src/api2/admin/verify.rs

@@ -12,6 +12,7 @@ use pbs_api_types::{
     PRIV_DATASTORE_AUDIT, PRIV_DATASTORE_VERIFY,
 };
 use pbs_config::verify;
+use pbs_config::CachedUserInfo;
 
 use crate::{
     api2::types::{
@@ -25,7 +26,6 @@ use crate::{
             compute_schedule_status,
         },
     },
-    config::cached_user_info::CachedUserInfo,
 };
 
 #[api(

src/api2/backup/mod.rs

@@ -26,7 +26,7 @@ use pbs_datastore::manifest::{archive_type, ArchiveType};
 
 use crate::server::{WorkerTask, H2Service};
 use crate::backup::DataStore;
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 
 mod environment;
 use environment::*;

src/api2/config/changer.rs

@@ -15,9 +15,9 @@ use pbs_api_types::{
     PROXMOX_CONFIG_DIGEST_SCHEMA, CHANGER_NAME_SCHEMA, SLOT_ARRAY_SCHEMA,
     PRIV_TAPE_AUDIT, PRIV_TAPE_MODIFY,
 };
+use pbs_config::CachedUserInfo;
 
 use crate::{
-    config::cached_user_info::CachedUserInfo,
     tape::{
         linux_tape_changer_list,
         check_drive_path,

src/api2/config/datastore.rs

@@ -24,7 +24,7 @@ use crate::api2::admin::{
     sync::list_sync_jobs,
     verify::list_verification_jobs,
 };
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 use crate::config::datastore::{self, DataStoreConfig, DataStoreConfigUpdater};
 use crate::server::{jobstate, WorkerTask};
 

src/api2/config/drive.rs

@@ -8,9 +8,9 @@ use pbs_api_types::{
     Authid, LtoTapeDrive, LtoTapeDriveUpdater, ScsiTapeChanger,
     PROXMOX_CONFIG_DIGEST_SCHEMA, DRIVE_NAME_SCHEMA, PRIV_TAPE_AUDIT, PRIV_TAPE_MODIFY,
 };
+use pbs_config::CachedUserInfo;
 
 use crate::{
-    config::cached_user_info::CachedUserInfo,
     tape::{
         lto_tape_device_list,
         check_drive_path,

src/api2/config/media_pool.rs

@@ -15,7 +15,7 @@ use pbs_api_types::{
     PRIV_TAPE_AUDIT, PRIV_TAPE_MODIFY,
 };
 
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 
 #[api(
     protected: true,

src/api2/config/remote.rs

@@ -13,7 +13,7 @@ use pbs_api_types::{
 };
 use pbs_config::sync;
 
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 
 #[api(
     input: {

src/api2/config/sync.rs

@@ -11,7 +11,7 @@ use pbs_api_types::{
 };
 use pbs_config::sync;
 
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 
 pub fn check_sync_job_read_access(
     user_info: &CachedUserInfo,
@@ -356,7 +356,7 @@ pub const ROUTER: Router = Router::new()
 
 #[test]
 fn sync_job_access_test() -> Result<(), Error> {
-    let (user_cfg, _) = crate::config::user::test_cfg_from_str(r###"
+    let (user_cfg, _) = pbs_config::user::test_cfg_from_str(r###"
 user: noperm@pbs
 
 user: read@pbs

src/api2/config/tape_backup_job.rs

@@ -10,7 +10,7 @@ use pbs_api_types::{
     PRIV_TAPE_AUDIT, PRIV_TAPE_MODIFY,
 };
 
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 
 #[api(
     input: {

src/api2/config/verify.rs

@@ -10,7 +10,7 @@ use pbs_api_types::{
 };
 use pbs_config::verify;
 
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 
 #[api(
     input: {

src/api2/node/subscription.rs

@@ -10,7 +10,7 @@ use pbs_api_types::{
 
 use crate::tools;
 use crate::tools::subscription::{self, SubscriptionStatus, SubscriptionInfo};
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 
 #[api(
     input: {

src/api2/node/tasks.rs

@@ -18,7 +18,7 @@ use pbs_api_types::{
 use crate::api2::types::TaskStateType;
 use crate::api2::pull::check_pull_privs;
 use crate::server::{self, UPID, UPIDExt, TaskState, TaskListInfoIterator};
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 
 // matches respective job execution privileges
 fn check_job_privs(auth_id: &Authid, user_info: &CachedUserInfo, upid: &UPID) -> Result<(), Error> {

src/api2/pull.rs

@@ -16,7 +16,7 @@ use pbs_api_types::{
 
 use crate::server::{WorkerTask, jobstate::Job, pull::pull_store};
 use crate::backup::DataStore;
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 
 pub fn check_pull_privs(
     auth_id: &Authid,

src/api2/reader/mod.rs

@@ -37,6 +37,7 @@ use pbs_datastore::PROXMOX_BACKUP_READER_PROTOCOL_ID_V1;
 use pbs_datastore::backup_info::BackupDir;
 use pbs_datastore::index::IndexFile;
 use pbs_datastore::manifest::{archive_type, ArchiveType};
+use pbs_config::CachedUserInfo;
 
 use crate::{
     api2::helpers,
@@ -45,7 +46,6 @@ use crate::{
         WorkerTask,
         H2Service,
     },
-    config::cached_user_info::CachedUserInfo,
 };
 
 mod environment;

src/api2/status.rs

@@ -22,7 +22,7 @@ use pbs_api_types::{
 use crate::backup::DataStore;
 use crate::config::datastore;
 use crate::tools::statistics::{linear_regression};
-use crate::config::cached_user_info::CachedUserInfo;
+use pbs_config::CachedUserInfo;
 
 #[api(
     returns: {

src/api2/tape/backup.rs

@@ -23,9 +23,9 @@ use pbs_api_types::{
 use pbs_datastore::{task_log, task_warn, StoreProgress};
 use pbs_datastore::backup_info::{BackupDir, BackupInfo};
 use pbs_datastore::task::TaskState;
+use pbs_config::CachedUserInfo;
 
 use crate::{
-    config::cached_user_info::CachedUserInfo,
     server::{
         lookup_user_email,
         TapeBackupJobSummary,

src/api2/tape/changer.rs

@@ -11,9 +11,9 @@ use pbs_api_types::{
     Authid, ChangerListEntry, LtoTapeDrive, MtxEntryKind, MtxStatusEntry, ScsiTapeChanger,
     CHANGER_NAME_SCHEMA, PRIV_TAPE_AUDIT, PRIV_TAPE_READ,
 };
+use pbs_config::CachedUserInfo;
 
 use crate::{
-    config::cached_user_info::CachedUserInfo,
     tape::{
         TAPE_STATUS_DIR,
         Inventory,

src/api2/tape/drive.rs

@@ -30,9 +30,9 @@ use pbs_api_types::{
  
 use pbs_datastore::task_log;
 use pbs_api_types::{PRIV_TAPE_AUDIT, PRIV_TAPE_READ, PRIV_TAPE_WRITE};
+use pbs_config::CachedUserInfo;
 
 use crate::{
-    config::cached_user_info::CachedUserInfo,
     api2::tape::restore::{
         fast_catalog_restore,
         restore_media,

src/api2/tape/media.rs

@@ -16,9 +16,9 @@ use pbs_api_types::{
     MediaStatus, MediaContentEntry, MediaContentListFilter,
     PRIV_TAPE_AUDIT,
 };
+use pbs_config::CachedUserInfo;
 
 use crate::{
-    config::cached_user_info::CachedUserInfo,
     tape::{
         TAPE_STATUS_DIR,
         Inventory,

src/api2/tape/restore.rs

@@ -41,10 +41,10 @@ use pbs_datastore::fixed_index::FixedIndexReader;
 use pbs_datastore::index::IndexFile;
 use pbs_datastore::manifest::{archive_type, ArchiveType, BackupManifest, MANIFEST_BLOB_NAME};
 use pbs_datastore::task::TaskState;
+use pbs_config::CachedUserInfo;
 
 use crate::{
     tools::ParallelHandler,
-    config::cached_user_info::CachedUserInfo,
     backup::DataStore,
     server::{
         lookup_user_email,