add never_expires to remove expiration dates of admin tokens and access keys

src/api/admin/admin_token.rs

@@ -124,7 +124,7 @@ impl RequestHandler for CreateAdminTokenRequest {
 			AdminApiToken::new(&format!("token_{}", Utc::now().format("%Y%m%d_%H%M")))
 		};
 
-		apply_token_updates(&mut token, self.0);
+		apply_token_updates(&mut token, self.0)?;
 
 		garage.admin_token_table.insert(&token).await?;
 
@@ -145,7 +145,7 @@ impl RequestHandler for UpdateAdminTokenRequest {
 	) -> Result<UpdateAdminTokenResponse, Error> {
 		let mut token = get_existing_admin_token(&garage, &self.id).await?;
 
-		apply_token_updates(&mut token, self.body);
+		apply_token_updates(&mut token, self.body)?;
 
 		garage.admin_token_table.insert(&token).await?;
 
@@ -204,7 +204,16 @@ async fn get_existing_admin_token(garage: &Garage, id: &String) -> Result<AdminA
 		.ok_or_else(|| Error::NoSuchAdminToken(id.to_string()))
 }
 
-fn apply_token_updates(token: &mut AdminApiToken, updates: UpdateAdminTokenRequestBody) {
+fn apply_token_updates(
+	token: &mut AdminApiToken,
+	updates: UpdateAdminTokenRequestBody,
+) -> Result<(), Error> {
+	if updates.never_expires && updates.expiration.is_some() {
+		return Err(Error::bad_request(
+			"cannot specify `expiration` and `never_expires`",
+		));
+	}
+
 	let params = token.params_mut().unwrap();
 
 	if let Some(name) = updates.name {
@@ -215,7 +224,12 @@ fn apply_token_updates(token: &mut AdminApiToken, updates: UpdateAdminTokenReque
 			.expiration
 			.update(Some(expiration.timestamp_millis() as u64));
 	}
+	if updates.never_expires {
+		params.expiration.update(None);
+	}
 	if let Some(scope) = updates.scope {
 		params.scope.update(AdminApiTokenScope(scope));
 	}
+
+	Ok(())
 }

src/api/admin/api.rs

@@ -366,6 +366,9 @@ pub struct UpdateAdminTokenRequestBody {
 	pub name: Option<String>,
 	/// Expiration time and date, formatted according to RFC 3339
 	pub expiration: Option<DateTime<Utc>>,
+	/// Set the admin token to never expire
+	#[serde(default)]
+	pub never_expires: bool,
 	/// Scope of the admin API token, a list of admin endpoint names (such as
 	/// `GetClusterStatus`, etc), or the special value `*` to allow all
 	/// admin endpoints. **WARNING:** Granting a scope of `CreateAdminToken` or
@@ -737,6 +740,9 @@ pub struct UpdateKeyRequestBody {
 	pub name: Option<String>,
 	/// Expiration time and date, formatted according to RFC 3339
 	pub expiration: Option<DateTime<Utc>>,
+	/// Set the access key to never expire
+	#[serde(default)]
+	pub never_expires: bool,
 	/// Permissions to allow for the key
 	pub allow: Option<KeyPerm>,
 	/// Permissions to deny for the key

src/api/admin/key.rs

@@ -105,7 +105,7 @@ impl RequestHandler for CreateKeyRequest {
 	) -> Result<CreateKeyResponse, Error> {
 		let mut key = Key::new("Unnamed key");
 
-		apply_key_updates(&mut key, self.0);
+		apply_key_updates(&mut key, self.0)?;
 
 		garage.key_table.insert(&key).await?;
 
@@ -152,7 +152,7 @@ impl RequestHandler for UpdateKeyRequest {
 	) -> Result<UpdateKeyResponse, Error> {
 		let mut key = garage.key_helper().get_existing_key(&self.id).await?;
 
-		apply_key_updates(&mut key, self.body);
+		apply_key_updates(&mut key, self.body)?;
 
 		garage.key_table.insert(&key).await?;
 
@@ -265,7 +265,13 @@ async fn key_info_results(
 	Ok(res)
 }
 
-fn apply_key_updates(key: &mut Key, updates: UpdateKeyRequestBody) {
+fn apply_key_updates(key: &mut Key, updates: UpdateKeyRequestBody) -> Result<(), Error> {
+	if updates.never_expires && updates.expiration.is_some() {
+		return Err(Error::bad_request(
+			"cannot specify `expiration` and `never_expires`",
+		));
+	}
+
 	let key_state = key.state.as_option_mut().unwrap();
 
 	if let Some(new_name) = updates.name {
@@ -276,6 +282,9 @@ fn apply_key_updates(key: &mut Key, updates: UpdateKeyRequestBody) {
 			.expiration
 			.update(Some(expiration.timestamp_millis() as u64));
 	}
+	if updates.never_expires {
+		key_state.expiration.update(None);
+	}
 	if let Some(allow) = updates.allow {
 		if allow.create_bucket {
 			key_state.allow_create_bucket.update(true);
@@ -286,4 +295,6 @@ fn apply_key_updates(key: &mut Key, updates: UpdateKeyRequestBody) {
 			key_state.allow_create_bucket.update(false);
 		}
 	}
+
+	Ok(())
 }