From 37b87869b58bfe0f02b8344c01b1e0d7fca039cc Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Mon, 15 Apr 2019 07:47:51 +0200
Subject: [PATCH] src/server/upid.rs: check for illegal characters

---
 src/server/upid.rs | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/server/upid.rs b/src/server/upid.rs
index 5ecc281d..c27ccdf5 100644
--- a/src/server/upid.rs
+++ b/src/server/upid.rs
@@ -3,7 +3,7 @@ use lazy_static::lazy_static;
 use regex::Regex;
 use chrono::Local;
 
-use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT};
+use std::sync::atomic::{AtomicUsize, Ordering};
 
 use crate::tools;
 
@@ -45,7 +45,18 @@ impl UPID {
 
         let pid = unsafe { libc::getpid() };
 
-        static WORKER_TASK_NEXT_ID: AtomicUsize = ATOMIC_USIZE_INIT;
+        let bad: &[_] = &['/', ':', ' '];
+
+        if worker_type.contains(bad) {
+            bail!("illegal characters in worker type '{}'", worker_type);
+        }
+        if let Some(ref worker_id) = worker_id {
+            if worker_id.contains(bad) {
+                bail!("illegal characters in worker id '{}'", worker_id);
+            }
+        }
+
+        static WORKER_TASK_NEXT_ID: AtomicUsize = AtomicUsize::new(0);
 
         let task_id = WORKER_TASK_NEXT_ID.fetch_add(1, Ordering::SeqCst);