Commit Graph

19963 Commits (90ec23b4104765ecb5c0735809b87aa2324576f1)

Author SHA1 Message Date
Isaac Connor 5508ba29be Don't exit on segfault, perhaps allowing graceful shutdown 2023-06-29 11:41:19 -04:00
Isaac Connor 46be99f798 Point to https 2023-06-29 11:40:15 -04:00
Isaac Connor 47afedfad2 Make objdetect modals 65% width to make it easier to see 2023-06-29 11:36:34 -04:00
Isaac Connor f3fd03209e Fix missing auth_relay on alarm xhr 2023-06-29 11:35:16 -04:00
Isaac Connor 8d80095690 Add the other submodule tarballs 2023-06-29 11:33:41 -04:00
Isaac Connor cdffff981d Be more specific about which permission failed, providing a better log message 2023-06-29 11:33:17 -04:00
Isaac Connor fb62fcccf8 Don't show bandwidth options if there are none to choose from 2023-06-29 11:31:14 -04:00
clipo1979 e4c16ec0fb Update fail2ban.rules
Update to add working rule for changes from version 1.35+
2023-06-29 11:30:47 -04:00
Isaac Connor c7917da0e0 Improve logged wrt insufficient permissions 2023-06-29 11:30:22 -04:00
Isaac Connor bb67bb0bce Debug alarm.jpg path when not found. Spacing. Remove unused Monitor variable 2023-06-29 10:51:35 -04:00
Isaac Connor 784ce14e50 Allow caching of images 2023-06-29 10:38:17 -04:00
Isaac Connor ce74d4a09d Diskspace(null) updates the db record so no need to call save as well 2023-06-29 10:38:02 -04:00
Martin Tiernan 2141403861 If no next bulk. Use Event data to estimate the delta. 2023-06-29 10:37:05 -04:00
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