Commit Graph

22064 Commits

Author SHA1 Message Date
Isaac Connor
af6d2c6ca3 The sw pix format for qsv should be YUV420P 2023-02-26 11:00:50 -05:00
Isaac Connor
725e58ad43 Merge pull request #3367 from haade-administrator/patch-2
update
2023-02-26 10:14:49 -05:00
Isaac Connor
af6e38caf0 Merge branch 'master' into patch-2 2023-02-26 10:14:35 -05:00
Isaac Connor
f2c2b869ad Merge pull request #3544 from dougnazar/fix_backtrace
Fix backtrace addr2line command.
2023-02-26 10:12:56 -05:00
Isaac Connor
6505bba826 Add qsv codec options 2023-02-25 19:00:31 -05:00
Isaac Connor
c1c25aeb76 Add sqv hwaccel types 2023-02-25 18:07:54 -05:00
Isaac Connor
79d19c21d1 Update validating access to Monitors, using canView due to Monitor and Groups permissions 2023-02-25 16:13:39 -05:00
Isaac Connor
9ceb22db8f Fix auth for monitor_permissions... 2023-02-25 16:00:34 -05:00
Isaac Connor
9fe1e507c7 fix scroll bars on user edit when sticky headers 2023-02-25 15:54:42 -05:00
Isaac Connor
77f55d81db Bump version for some more geolocation features db updates 2023-02-25 13:20:45 -05:00
Isaac Connor
84383a0498 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-02-25 13:17:53 -05:00
Isaac Connor
12409e624e Support username and password as auth query params. These happen when using auth_relay=plain. 2023-02-25 13:12:40 -05:00
iconnor@connortechnology.com
3cda5ab235 Include map.js 2023-02-25 13:06:17 -05:00
iconnor@connortechnology.com
afcf55608e Move map generation into an Object so it can be reused. 2023-02-25 13:04:49 -05:00
iconnor@connortechnology.com
155502ee32 Must include Storage.php 2023-02-25 13:02:29 -05:00
iconnor@connortechnology.com
a7743dd0ed Add DiskTotalSpace and DiskUsedSpace to returned Storage objects 2023-02-25 13:02:19 -05:00
Isaac Connor
a7af29c0c4 Add IN operator 2023-02-25 13:00:38 -05:00
Isaac Connor
0995a44561 Only show Location tab if geolocation is turned on 2023-02-25 12:46:48 -05:00
Isaac Connor
a2879fb66c Add Map view to header 2023-02-25 12:46:34 -05:00
Isaac Connor
b0413f330e Merge branch 'map' 2023-02-25 12:44:28 -05:00
iconnor@connortechnology.com
4979d299a6 Cleanup code style 2023-02-25 12:40:54 -05:00
iconnor@connortechnology.com
cbabf9d5ce Add getFromApi 2023-02-25 12:40:41 -05:00
Isaac Connor
39de76e989 add a db_version and a feature check function to determine if we support skip locks in the query. Use it to disable the feature in filter view. 2023-02-25 11:44:50 -05:00
Isaac Connor
24313b1a59 uint16 should be plenty for width and height, so width*height will not overflow an int32. Might fix a codeQL warning. 2023-02-23 17:16:28 -05:00
Isaac Connor
a62f4b2e77 Use snprintf instead of sprintf to quieten codeql 2023-02-23 16:52:19 -05:00
Isaac Connor
82a28b78d8 Use function style of member access to prevent errors on unsaved monitor 2023-02-23 13:22:50 -05:00
Isaac Connor
6867b0c841 Correct the syntax of the CSP 2023-02-23 09:47:49 -05:00
Isaac Connor
32afb13b39 Sanitise attr input in FilterTerm to prefent SQL Injection. Fixes GHSA-222j-wh8m-xjrx 2023-02-23 09:25:03 -05:00
Isaac Connor
89f0565edc TimeStamp column is not int10, it is a timestamp. Fix logged errors from zm_stats.pl 2023-02-23 09:25:03 -05:00
Isaac Connor
75e8ed5ce0 When FIND_VERSION is set, don't error out if a lower version is found, just unset GSOAP_FOUND 2023-02-22 06:30:03 -05:00
Isaac Connor
7b36027066 add in files actions, with delete 2023-02-22 05:59:16 -05:00
Isaac Connor
a5d2ff4b40 Add more generated build files to gitignore 2023-02-22 05:59:16 -05:00
Isaac Connor
a7b1379502 Add AVPixelFormat to shm for each image, disable analysis image viewing. The cp to shm is too expensive. Need something better. 2023-02-22 05:59:16 -05:00
Isaac Connor
4a19b4ec05 Scale the thumbnail, not the full view 2023-02-21 14:26:37 -05:00
Isaac Connor
d6dc1d3e30 Add object-src CSP directive 2023-02-20 18:15:16 -05:00
Isaac Connor
44c7582003 Don't shorten analysis 2023-02-20 17:30:48 -05:00
Isaac Connor
d073ba37ba Default to Monitor->DefaultScale instead of 100% scale. 2023-02-20 15:42:30 -05:00
Isaac Connor
bfbe0d581b uncomment out the mintime and maxtime validations. They were commented out for some quick testing. 2023-02-20 12:27:16 -05:00
Isaac Connor
cb3fb03f92 Bump version for visibility in CVEs 2023-02-20 12:11:56 -05:00
Isaac Connor
decf3e307b Use dbEscapeString on username retrieved from jwt to prevent SQL injection 2023-02-20 12:10:49 -05:00
Isaac Connor
119e4e6756 use detaintPath on modal to prevent including other files instead of real modals 2023-02-20 11:58:10 -05:00
Isaac Connor
4067151fd8 Check for valid date in minTime and maxTime to prevent SQL attack 2023-02-20 11:54:50 -05:00
Isaac Connor
8d36edb602 Be more specific about which form we are styling so as not to affect modals 2023-02-20 11:54:29 -05:00
Isaac Connor
4f66ab3503 Introduce check_datetime function to validate dates 2023-02-20 11:53:53 -05:00
Isaac Connor
00234fbb20 Attempt to sanitize daemon and arguments before executing commands to prevent executing other programs. 2023-02-20 11:53:32 -05:00
Isaac Connor
82a9d6d444 Use validCardinal on Id to prevent executing other commands 2023-02-20 11:41:41 -05:00
Isaac Connor
d6575cdec3 Adjust size of text inputs MonitorName and Source Path Filters to match chosen inputs 2023-02-20 10:36:13 -05:00
Isaac Connor
f4a2925177 Test for valid monitor id in snapshot creation. 2023-02-20 10:30:34 -05:00
Isaac Connor
bf810ec8c4 test for existence of username in session to prevent error outputs 2023-02-20 10:20:59 -05:00
Isaac Connor
80797e97d7 Move actions process to after the unauth check. In the past the action did the logging in but that is no longer the case. We can now assume in actions that the user is at least logged in. 2023-02-20 10:16:44 -05:00