Commit Graph

20102 Commits (31b9fd0c5e49181358eb225601183f22dfec1701)

Author SHA1 Message Date
Isaac Connor c194ab98f4 Load event using find_one which does caching. 2023-06-29 10:33:06 -04:00
Isaac Connor 387a9ebc8a Load the ZM::Event using the Event Model data instead of loading by Id which goes back to db. 2023-06-29 10:31:51 -04:00
Isaac Connor 3479983c6d Fix where error_log write to to include path 2023-06-29 10:31:00 -04:00
Isaac Connor c83f17906d Do not allow directory names in ZM_LOG_DEBUG_FILE. Only log to ZM_LOG_DIR 2023-06-29 10:30:44 -04:00
Isaac Connor d63877643a Clean up help text for ZM_LOG_DEBUG_FILE to not say that it can include a directory. It should be JUST a filename. 2023-06-29 10:30:27 -04:00
Isaac Connor caa8a808f9 Spelling, fix missing db in database create for bullseye, add bookworm instructions 2023-06-29 10:12:46 -04:00
Isaac Connor 751923b542 Remove chowning /usr/share/zoneminder. Its bad. 2023-06-29 10:10:24 -04:00
Isaac Connor 4390bbad87 Merge pull request #3729 from Simpler1/patch-5
Help text for OPTIONS_ALARMMAXFPS
2023-06-29 10:09:48 -04:00
Isaac Connor 7f2b096fd7 Add bookwork support 2023-06-29 10:06:52 -04:00
iconnor 60285ba16b Implement more fixes for ffmpeg5 channel deprecations. 2023-06-27 14:56:06 -04:00
Isaac Connor d7682ba95d Handle ffmpeg5 channel deprecations 2023-06-27 13:34:19 -04:00
Isaac Connor 4beeb02308
Merge pull request #3667 from kunkku/fix-mouse-event-prop-names
fix MouseEvent property names
2023-03-02 09:22:58 -05:00
Kaarle Ritvanen 12b42e8b33 fix MouseEvent property names
allowing zooming into recorded events
2023-03-02 14:31:21 +02:00
Isaac Connor 034ed3e21b Sanitise attr input in FilterTerm to prefent SQL Injection. Fixes GHSA-222j-wh8m-xjrx 2023-02-23 16:44:01 -05:00
Isaac Connor 57bf25d39f Correct the syntax of the CSP 2023-02-23 09:48:00 -05:00
Isaac Connor aeb82923d5 Revert "Remove dh-systemd as a dep"
This reverts commit 2cace9653f.
2023-02-21 09:58:37 -05:00
Isaac Connor 2cace9653f Remove dh-systemd as a dep 2023-02-20 18:26:13 -05:00
Isaac Connor 2c4a925554 Remove dh-systemd as a dependency. Hopefully it's not needed anymore 2023-02-20 18:26:13 -05:00
Isaac Connor 4637eaf9ea Add object-src CSP directive 2023-02-20 18:26:03 -05:00
Isaac Connor 3406d15dbd restore fps reporting 2023-02-20 18:00:42 -05:00
Peter Keresztes Schmidt 3fb02185de db: Add helper for escaping strings and use it 2023-02-20 17:36:56 -05:00
Isaac Connor d465b878ba Use dbEscapeString on username retrieved from jwt to prevent SQL injection 2023-02-20 12:25:56 -05:00
Isaac Connor 6e417c28ea use detaintPath on modal to prevent including other files instead of real modals 2023-02-20 12:25:43 -05:00
Isaac Connor 4f4ddaab3f Check for valid date in minTime and maxTime to prevent SQL attack 2023-02-20 12:25:25 -05:00
Isaac Connor 5b17f0bb06 Introduce check_datetime function to validate dates 2023-02-20 12:24:19 -05:00
Isaac Connor 3bd58d8393 Attempt to sanitize daemon and arguments before executing commands to prevent executing other programs. 2023-02-20 12:23:19 -05:00
Isaac Connor a495eda6be Use validCardinal on Id to prevent executing other commands 2023-02-20 12:23:06 -05:00
Isaac Connor 707c3a0561 Adjust size of text inputs MonitorName and Source Path Filters to match chosen inputs 2023-02-20 12:22:50 -05:00
Isaac Connor 609b22a54d Test for valid monitor id in snapshot creation. 2023-02-20 12:20:21 -05:00
Isaac Connor 04f02d624d test for existence of username in session to prevent error outputs 2023-02-20 12:19:51 -05:00
Isaac Connor 6ffd2bda1c 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 12:19:04 -05:00
Isaac Connor 2c2c49a9d9 Fix detaintPath not stripping sequences like ..././ 2023-02-20 12:18:39 -05:00
Isaac Connor e1028c1d7f Escape <> in log messages to prevent html shenanigans. Fixes #3596 2023-02-18 18:10:08 -05:00
Isaac Connor 1546fabfc8 Don't start the statusCmdQuery on streaming start, because it is used when doing still updates. If we start it too fast, zms may not have started yet 2023-02-16 14:48:07 -05:00
Isaac Connor 247805edad Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36 2023-02-16 14:09:48 -05:00
Isaac Connor 8370ae6c82 Set a short expiry 1min and set the cookie name to include the filter so that each and every filter gets it;s own pagination saved. Fixes #3510 2023-02-16 14:09:18 -05:00
Isaac Connor dc08e8c49e Use reload instead of restart on zone save 2023-02-16 13:58:09 -05:00
Isaac Connor d9d2f4d10d Add reload to monitor zmcControl 2023-02-16 13:57:42 -05:00
Isaac Connor 45157030df Stop streams when clicking cancel/Save so that we don't log errors trying to access a dead zms. Fixes #3643 2023-02-16 13:54:02 -05:00
Isaac Connor 5c0f42ba15 Fix spacing 2023-02-16 12:50:47 -05:00
Isaac Connor 6585db7463 Adding :80 to address is not worthy of an Error log 2023-02-13 14:55:34 -05:00
Isaac Connor 6d5e8f3e09 Add a sleeping flag so that when we get sigterm, we can just exit instead of returning to the sleep 2023-02-13 14:52:43 -05:00
Isaac Connor a2a35dccfa Don't strip tags from log Message. It removes anything involving > OR < 2023-02-13 14:52:28 -05:00
Isaac Connor 23a0ea3f5f format endtime 2023-02-13 14:51:24 -05:00
Isaac Connor 041953ec4f tabs instead of spaces are messing up ul layout 2023-02-13 14:49:10 -05:00
Isaac Connor 7a7b5c99c3 Include command line in debug output when generating images 2023-02-13 14:48:56 -05:00
Isaac Connor 760ff33663 Add the actual packet, not the first packet over and over and over. Fixes #3656 2023-02-13 14:48:42 -05:00
Isaac Connor c9066f7423 Remove test for Enabled on monitor. Motion detection being disabled has nothing to do with manual triggering. Fixes #3657 2023-02-06 14:52:38 -05:00
Isaac Connor 4727aac644 Allow viewing of events whose Monitor[Function]=None 2023-01-25 13:38:51 -05:00
Isaac Connor ff4a8c6e0d Remove stripslashes when saving config values. The values in REQUEST have not been escaped, so stripslashes is not appropriate. Fixes #3655 2023-01-24 11:48:32 -05:00