diff --git a/Cargo.lock b/Cargo.lock index acff494..0e1f51c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -149,7 +149,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -205,9 +205,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "block-buffer" @@ -333,7 +333,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -462,7 +462,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -473,7 +473,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -484,7 +484,7 @@ checksum = "4e018fccbeeb50ff26562ece792ed06659b9c2dae79ece77c4456bb10d9bf79b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -743,7 +743,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -833,9 +833,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f" +checksum = "398e3da68749fdc32783cbf7521ec3f65c9cf946db8c7774f8460af49e52c6e2" dependencies = [ "futures-channel", "futures-core", @@ -851,9 +851,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" +checksum = "e4feb96b31c32730ea3e1e89aecd2e4e37ecb1c473ad8f685e3430a159419f63" dependencies = [ "glib-sys", "gobject-sys", @@ -864,11 +864,11 @@ dependencies = [ [[package]] name = "glib" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf" +checksum = "fee90a615ce05be7a32932cfb8adf2c4bbb4700e80d37713c981fb24c0c56238" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "futures-channel", "futures-core", "futures-executor", @@ -886,22 +886,22 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.3" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d" +checksum = "4da558d8177c0c8c54368818b508a4244e1286fce2858cef4e547023f0cfa5ef" dependencies = [ "heck 0.5.0", "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] name = "glib-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" +checksum = "4958c26e5a01c9af00dea669a97369eccbec29a8e6d125c24ea2d85ee7467b60" dependencies = [ "libc", "system-deps", @@ -909,9 +909,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" +checksum = "c6908864f5ffff15b56df7e90346863904f49b949337ed0456b9287af61903b8" dependencies = [ "glib-sys", "libc", @@ -920,9 +920,9 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.22.3" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066f3c354c526792a3deb8b6d349eba8ffcc13bae4d0bf05d4adf4bf1b91e459" +checksum = "21e95b1d1153239a621ec143501fdcca6c1ad3efb87d268597285f85c4136f73" dependencies = [ "cfg-if", "futures-channel", @@ -930,7 +930,7 @@ dependencies = [ "futures-util", "glib", "gstreamer-sys", - "itertools 0.12.1", + "itertools 0.13.0", "libc", "muldiv", "num-integer", @@ -945,9 +945,9 @@ dependencies = [ [[package]] name = "gstreamer-app" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50184e88d3462a796a5924fb329839c102b22f9383c1636323fa4ef5255dea92" +checksum = "e0c86915cc4cdfa030532301a46c725e0ce0c6c2b57a68c44ce9b34db587e552" dependencies = [ "futures-core", "futures-sink", @@ -960,9 +960,9 @@ dependencies = [ [[package]] name = "gstreamer-app-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6771c0939f286fb261525494a0aad29435b37e802284756bab24afe3bbca7476" +checksum = "37066c1b93ba57aa070ebc1e0a564bc1a9adda78fb0850e624861fad46fd1448" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -973,9 +973,9 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514c71195b53c7eced4842b66ca9149833e41cf6a1d949e45e2ca4a4fa929850" +checksum = "a3faa0b3cf361bf538dcb25b5cb7f6e73bd872ed031d85f3997b42d3fbd66409" dependencies = [ "atomic_refcell", "cfg-if", @@ -987,9 +987,9 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "286591e0f85bbda1adf9bab6f21d015acd9ca0a4d4acb61da65e3d0487e23c4e" +checksum = "4a6643ef963c636b8022adc93aa19eac6f356bd174a187c499339fc5d64c1e05" dependencies = [ "glib-sys", "gobject-sys", @@ -1000,9 +1000,9 @@ dependencies = [ [[package]] name = "gstreamer-net" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0f4ff263821ae2c3a2de4771510dd07faba7af9d908441a738da6eb2cfc901" +checksum = "9021fba4d09e686c9d0d8fe4dfa2320a3eb4a89e46130f0cd290a37098be17d9" dependencies = [ "gio", "glib", @@ -1012,9 +1012,9 @@ dependencies = [ [[package]] name = "gstreamer-net-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fab77482d011b99fb78ad133cd30c11b27bfc203b58da9d18d8eccecea56273" +checksum = "5b4151d4c7ad3d3c0a2b839b2b1b00930a1b445a5f0c2f99cc26c761eab5bf53" dependencies = [ "gio-sys", "glib-sys", @@ -1025,9 +1025,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60d55c8cffe9edc8e3156c3d2f6305e86e2e4eda303f02c00e1255739f970b1f" +checksum = "5a2c5018f3c36992df5795532749e810d41a7c6a50123a5b02746bc8cb2cabc2" dependencies = [ "glib", "gstreamer", @@ -1038,9 +1038,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-server" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7494b38cf577bf33fe1e3c28cf80ef5ee7f1d7724c6f5e37e1fddacd35f4d382" +checksum = "583b458406bd3053ec3336376e8f31de3387faeb30aac85a5563f194f5d3901b" dependencies = [ "gio", "glib", @@ -1054,9 +1054,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-server-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc8c571931ce0ec8a4f342ed0e5094d37192ffd7bb1a463def3d89c43a273d51" +checksum = "6f3de411751e82c40422fbed9708c70a2f7921c90e79205c189f8a3dda489994" dependencies = [ "gio-sys", "glib-sys", @@ -1071,9 +1071,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dc20e7083bf12ee94c880bd50410948addb2ed080a05f38982f06a43640b490" +checksum = "4414e397f632d9cc373eeac7ab4040c72ec12b23c85a9993ec452db110d5b32c" dependencies = [ "gio-sys", "glib-sys", @@ -1086,9 +1086,9 @@ dependencies = [ [[package]] name = "gstreamer-sdp" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f9aa459d119aa787efc18edcc591736e1e6cd488835825d1807532456ba2dbd" +checksum = "55409c506b35b896e8f77477f1c6a3c0323fa8faacbc233173b04be39ceaa257" dependencies = [ "glib", "gstreamer", @@ -1097,9 +1097,9 @@ dependencies = [ [[package]] name = "gstreamer-sdp-sys" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d80dfc4811c67ca66586b4e470f85ab25aca4ea92bd2ba2665552c1dd0e5609" +checksum = "b5310c77cef02c0fbbc20e68d9aef20e0b03db5dc9b4c305dfdc5d72002e0f94" dependencies = [ "glib-sys", "gstreamer-sys", @@ -1109,9 +1109,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.22.2" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5ddf526b3bf90ea627224c804f00b8bcb0452e3b447978b4d5092f8e8ff5918" +checksum = "d9c9005b55dd2b1784645963c1ec409f9d420a56f6348d0ae69c2eaff584bcc3" dependencies = [ "glib-sys", "gobject-sys", @@ -1407,9 +1407,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -1447,7 +1447,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -1481,9 +1481,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mime" @@ -1583,8 +1583,7 @@ dependencies = [ "tokio-util", "toml", "uuid", - "validator 0.17.0", - "validator_derive 0.17.0", + "validator 0.18.1", ] [[package]] @@ -1717,7 +1716,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "foreign-types", "libc", @@ -1734,7 +1733,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -1890,9 +1889,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1972,9 +1971,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.31.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" dependencies = [ "memchr", "serde", @@ -2194,7 +2193,7 @@ version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -2347,7 +2346,7 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -2407,7 +2406,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -2534,9 +2533,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.58" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -2572,9 +2571,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.2" +version = "7.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +checksum = "6c81f13d9a334a6c242465140bd262fae382b752ff2011c4f7419919a9c97922" dependencies = [ "cfg-expr", "heck 0.5.0", @@ -2638,7 +2637,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -2663,9 +2662,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -2686,9 +2685,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -2737,7 +2736,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -2971,7 +2970,7 @@ checksum = "9881bea7cbe687e36c9ab3b778c36cd0487402e270304e8b1296d5085303c1a2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -2991,9 +2990,9 @@ dependencies = [ [[package]] name = "validator" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da339118f018cc70ebf01fafc103360528aad53717e4bf311db929cb01cb9345" +checksum = "db79c75af171630a3148bd3e6d7c4f42b6a9a014c2945bc5ed0020cbb8d9478e" dependencies = [ "idna 0.5.0", "once_cell", @@ -3002,6 +3001,7 @@ dependencies = [ "serde_derive", "serde_json", "url", + "validator_derive 0.18.1", ] [[package]] @@ -3022,16 +3022,16 @@ dependencies = [ [[package]] name = "validator_derive" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e88ea23b8f5e59230bff8a2f03c0ee0054a61d5b8343a38946bcd406fe624c" +checksum = "55591299b7007f551ed1eb79a684af7672c19c3193fb9e0a31936987bb2438ec" dependencies = [ "darling", + "once_cell", "proc-macro-error", "proc-macro2", "quote", - "regex", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] @@ -3098,7 +3098,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", "wasm-bindgen-shared", ] @@ -3132,7 +3132,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3413,7 +3413,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.58", + "syn 2.0.72", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 9741eb7..526b20b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,16 +23,16 @@ dirs = "5.0.1" env_logger = "0.11.3" fcm-push-listener = "2.0.3" futures = "0.3.28" -gstreamer = "0.22.3" -gstreamer-app = { version = "0.22.0", features = ["v1_20"] } -gstreamer-rtsp = { version = "0.22.0", features = ["v1_20"] } -gstreamer-rtsp-server = { version = "0.22.0", features = ["v1_20"] } +gstreamer = "0.23.0" +gstreamer-app = { version = "0.23.0", features = ["v1_20"] } +gstreamer-rtsp = { version = "0.23.0", features = ["v1_20"] } +gstreamer-rtsp-server = { version = "0.23.0", features = ["v1_20"] } heck = "0.5.0" log = { version = "0.4.17", features = [ "release_max_level_debug" ] } md5 = "0.7.0" neolink_core = { path = "crates/core", version = "0.6.3-rc.2" } once_cell = "1.19.0" -quick-xml = { version = "0.31.0", features = ["serialize"] } +quick-xml = { version = "0.36.1", features = ["serialize"] } regex = "1.7.3" rumqttc = "0.24.0" serde = { version = "1.0.160", features = ["derive"] } @@ -42,8 +42,7 @@ tokio-stream = "0.1.12" tokio-util = { version = "0.7.7", features = ["full", "tracing"] } toml = "0.8.2" uuid = { version = "1.8.0", features = ["v4"] } -validator = "0.17.0" -validator_derive = "0.17.0" +validator = {version="0.18.1", features = ["derive"] } [target.'cfg(not(target_env = "msvc"))'.dependencies] tikv-jemallocator = "0.5" diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 1270dc9..48fe57f 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -20,7 +20,7 @@ lazy_static = "1.4.0" log = "0.4.17" md5 = "0.7.0" nom = { version = "7.1.3", features = ["alloc"] } -quick-xml = { version = "0.31.0", features = ["serialize"] } +quick-xml = { version = "0.36.0", features = ["serialize"] } rand = "0.8.5" regex = "1.7.3" serde = { version = "1.0.106", features = ["derive"] } diff --git a/src/config.rs b/src/config.rs index 776e363..82d4eb4 100644 --- a/src/config.rs +++ b/src/config.rs @@ -5,8 +5,8 @@ use regex::Regex; use serde::{Deserialize, Serialize}; use std::clone::Clone; use std::collections::HashSet; +use validator::Validate; use validator::ValidationError; -use validator_derive::Validate; static RE_TLS_CLIENT_AUTH: Lazy = Lazy::new(|| Regex::new(r"^(none|request|require)$").unwrap()); @@ -17,7 +17,7 @@ static RE_MAXENC_SRC: Lazy = Lazy::new(|| { #[derive(Debug, Deserialize, Serialize, Validate, Clone, PartialEq)] pub(crate) struct Config { - #[validate] + #[validate(nested)] pub(crate) cameras: Vec, #[serde(rename = "bind", default = "default_bind_addr")] @@ -44,7 +44,7 @@ pub(crate) struct Config { #[serde(default = "default_tls_client_auth")] pub(crate) tls_client_auth: String, - #[validate] + #[validate(nested)] #[serde(default)] pub(crate) users: Vec, } @@ -148,11 +148,11 @@ pub(crate) struct CameraConfig { #[serde(default = "default_channel_id", alias = "channel")] pub(crate) channel_id: u8, - #[validate] + #[validate(nested)] #[serde(default = "default_mqtt")] pub(crate) mqtt: MqttConfig, - #[validate] + #[validate(nested)] #[serde(default = "default_pause")] pub(crate) pause: PauseConfig, diff --git a/src/rtsp/gst/server.rs b/src/rtsp/gst/server.rs index e1de67d..46cb38c 100644 --- a/src/rtsp/gst/server.rs +++ b/src/rtsp/gst/server.rs @@ -47,10 +47,13 @@ impl NeoRtspServer { // Setup auth let auth = factory.auth().unwrap_or_default(); auth.set_supported_methods(RTSPAuthMethod::Basic); - let mut un_authtoken = RTSPToken::new(&[ - //RTSP_TOKEN_MEDIA_FACTORY_ROLE: Means look inside the media factory settings and use the same permissions this user (`"anonymous"`) has - (RTSP_TOKEN_MEDIA_FACTORY_ROLE, &"anonymous"), - ]); + let mut un_authtoken = RTSPToken::builder() + .field( + //RTSP_TOKEN_MEDIA_FACTORY_ROLE: Means look inside the media factory settings and use the same permissions this user (`"anonymous"`) has + RTSP_TOKEN_MEDIA_FACTORY_ROLE, + "anonymous", + ) + .build(); auth.set_default_token(Some(&mut un_authtoken)); factory.set_auth(Some(&auth)); @@ -217,7 +220,9 @@ impl NeoRtspServerImpl { let mut locked_users = self.users.write().await; let auth = self.obj().auth().unwrap(); - let token = RTSPToken::new(&[(RTSP_TOKEN_MEDIA_FACTORY_ROLE, &username)]); + let token = RTSPToken::builder() + .field(RTSP_TOKEN_MEDIA_FACTORY_ROLE, username) + .build(); let basic = RTSPAuth::make_basic(username, password); if let Some(old_basic) = locked_users.get(username) {