Merge branch 'nextcloud:main' into main

Author: rizlas

Cargo.lock

@@ -29,7 +29,7 @@ rand = { version = "0.8.5", features = ["small_rng"] }
 ahash = "0.8.12"
 flexi_logger = { version = "0.31.8", features = ["colors"] }
 tokio-stream = { version = "0.1.17", features = ["net"] }
-nextcloud-config-parser = "0.15.1"
+nextcloud-config-parser = "0.15.2"
 url = "2.5.4"
 clap = { version = "4.5.43", features = ["derive"] }
 sd-notify = { version = "0.5.0", optional = true }

Cargo.toml

@@ -11,7 +11,7 @@
     <description><![CDATA[Push update support for desktop app.
 
 Once the app is installed, the push binary needs to be setup. You can either use the setup wizard with `occ notify_push:setup` or see the [README](http://github.com/nextcloud/notify_push) for detailed setup instructions]]></description>
-    <version>1.3.1</version>
+    <version>1.3.3</version>
     <licence>agpl</licence>
     <author>Robin Appelman</author>
     <namespace>NotifyPush</namespace>
@@ -27,7 +27,7 @@ Once the app is installed, the push binary needs to be setup. You can either use
     <bugs>https://github.com/nextcloud/notify_push/issues</bugs>
 
     <dependencies>
-        <nextcloud min-version="29" max-version="33"/>
+        <nextcloud min-version="30" max-version="34"/>
     </dependencies>
 
     <repair-steps>

appinfo/info.xml

@@ -27,7 +27,7 @@
       };
       lib = pkgs.lib;
 
-      hostTarget = pkgs.hostPlatform.config;
+      hostTarget = pkgs.stdenv.hostPlatform.config;
       targets = [
         "x86_64-unknown-linux-musl"
         "i686-unknown-linux-musl"

flake.nix

@@ -22,6 +22,7 @@
 use OCP\Notification\IDismissableNotifier;
 use OCP\Notification\INotification;
 use OCP\Notification\INotifier;
+use OCP\Notification\UnknownNotificationException;
 use OCP\Share\Events\ShareCreatedEvent;
 use OCP\Share\IShare;
 
@@ -102,7 +103,7 @@ public function getName(): string {
 	}
 
 	public function prepare(INotification $notification, string $languageCode): INotification {
-		throw new \InvalidArgumentException();
+		throw new UnknownNotificationException();
 	}
 
 	public function dismissNotification(INotification $notification): void {

lib/Listener.php

@@ -8,7 +8,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns="https://getpsalm.org/schema/config"
 	xsi:schemaLocation="https://getpsalm.org/schema/config https://getpsalm.org/schema/config"
-	phpVersion="8.0"
+	phpVersion="8.1"
 >
 	<projectFiles>
 		<directory name="lib"/>

psalm.xml

@@ -20,7 +20,7 @@ use sqlx::any::AnyConnectOptions;
 use std::convert::{TryFrom, TryInto};
 use std::env::var;
 use std::fmt::{Debug, Display, Formatter};
-use std::net::{IpAddr, Ipv4Addr, SocketAddr};
+use std::net::{IpAddr, Ipv6Addr, SocketAddr};
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
 
@@ -183,9 +183,7 @@ impl TryFrom<PartialConfig> for Config {
         let bind = match config.socket {
             Some(socket) => Bind::Unix(socket, socket_permissions),
             None => {
-                let ip = config
-                    .bind
-                    .unwrap_or_else(|| IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)));
+                let ip = config.bind.unwrap_or(IpAddr::V6(Ipv6Addr::UNSPECIFIED));
                 let port = config.port.unwrap_or(7867);
                 Bind::Tcp((ip, port).into())
             }
@@ -194,9 +192,7 @@ impl TryFrom<PartialConfig> for Config {
         let metrics_bind = match (config.metrics_socket, config.metrics_port) {
             (Some(socket), _) => Some(Bind::Unix(socket, socket_permissions)),
             (None, Some(port)) => {
-                let ip = config
-                    .bind
-                    .unwrap_or_else(|| IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)));
+                let ip = config.bind.unwrap_or(IpAddr::V6(Ipv6Addr::UNSPECIFIED));
                 Some(Bind::Tcp((ip, port).into()))
             }
             _ => None,

src/config.rs

@@ -226,6 +226,7 @@ pub async fn handle_user_socket(
                     // hack while warp only has opaque error types
                     match formatted.as_str() {
                         "WebSocket protocol error: Connection reset without closing handshake"
+                        | "Broken pipe (os error 32)"
                         | "IO error: Connection reset by peer (os error 104)" => {
                             log::debug!("websocket error: {e:#}")
                         }
@@ -262,11 +263,13 @@ async fn socket_auth(
     let username_msg = read_socket_auth_message(rx).await?;
     let username = username_msg
         .to_str()
-        .map_err(|_| AuthenticationError::InvalidMessage)?;
+        .map_err(|_| AuthenticationError::InvalidMessage)?
+        .trim();
     let password_msg = read_socket_auth_message(rx).await?;
     let password = password_msg
         .to_str()
-        .map_err(|_| AuthenticationError::InvalidMessage)?;
+        .map_err(|_| AuthenticationError::InvalidMessage)?
+        .trim();
 
     // cleanup all pre_auth tokens older than 15s
     let cutoff = Instant::now() - Duration::from_secs(15);

src/connection.rs

@@ -13,6 +13,7 @@ use log::debug;
 use rand::{thread_rng, Rng};
 use sqlx::any::AnyConnectOptions;
 use sqlx::{query_as, Any, AnyPool, FromRow};
+use std::sync::atomic::{AtomicBool, Ordering};
 use std::time::Instant;
 use tokio::time::Duration;
 
@@ -27,6 +28,7 @@ pub struct UserStorageAccess {
 struct CachedAccess {
     access: Vec<UserStorageAccess>,
     valid_till: Instant,
+    updating: AtomicBool,
 }
 
 impl CachedAccess {
@@ -36,11 +38,16 @@ impl CachedAccess {
             access,
             valid_till: Instant::now()
                 + Duration::from_millis(rng.gen_range((4 * 60 * 1000)..(5 * 60 * 1000))),
+            updating: AtomicBool::new(false),
         }
     }
 
     pub fn is_valid(&self) -> bool {
-        self.valid_till > Instant::now()
+        self.valid_till > Instant::now() || self.updating.load(Ordering::SeqCst)
+    }
+
+    pub fn prepare_update(&self, value: bool) {
+        self.updating.store(value, Ordering::SeqCst);
     }
 }
 
@@ -71,14 +78,27 @@ impl StorageMapping {
         &self,
         storage: u32,
     ) -> Result<Ref<'_, u32, CachedAccess>, DatabaseError> {
-        if let Some(cached) = self.cache.get(&storage).filter(|cached| cached.is_valid()) {
-            Ok(cached)
-        } else {
-            let users = self.load_storage_mapping(storage).await?;
+        if let Some(cached) = self.cache.get(&storage) {
+            if cached.is_valid() {
+                return Ok(cached);
+            }
+
+            cached.prepare_update(true);
+            let users = self
+                .load_storage_mapping(storage)
+                .await
+                .inspect_err(|_| cached.prepare_update(false))?;
 
-            self.cache.insert(storage, CachedAccess::new(users));
-            Ok(self.cache.get(&storage).unwrap())
+            drop(cached);
+            let cached = CachedAccess::new(users);
+            self.cache.insert(storage, cached);
+            return Ok(self.cache.get(&storage).unwrap());
         }
+
+        let users = self.load_storage_mapping(storage).await?;
+
+        self.cache.insert(storage, CachedAccess::new(users));
+        Ok(self.cache.get(&storage).unwrap())
     }
 
     pub async fn get_users_for_storage_path(