mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-04-05 06:24:15 -04:00
Code Issues Packages Projects Releases Wiki Activity
22,021 Commits 80 Branches 104 Tags
bfbe0d581b6c373e898b7c812a5768d55f88ec00
Commit Graph

22021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Isaac Connor
3268f95282 Fix detaintPath not stripping sequences like ..././ 2023-02-20 09:18:51 -05:00
Isaac Connor
2ec375d51c Default to auto instead of 100% scale. 2023-02-19 17:29:32 -05:00
Isaac Connor
74a0790c56 Use const instead of var, code comment fix 2023-02-19 17:29:32 -05:00
Isaac Connor
3803a872fc Replace some vars with const or let 2023-02-19 17:29:32 -05:00
Isaac Connor
5090000cdd Remove ZM\s that shouldn't be there 2023-02-19 17:29:32 -05:00
Isaac Connor
717b156d86 Bump version to pick up db updates for Server_Stats 2023-02-19 14:49:06 -05:00
Isaac Connor
9a996cb423 image may have been deleted, but analysis image may still be there. Correct logic so that analysis frame get saved again. 2023-02-19 14:47:43 -05:00
Isaac Connor
ef9ce9b714 Fix inserts into Server_Stats 2023-02-18 18:02:15 -05:00
Isaac Connor
25a7159393 Allow ServerId to be NULL, which is the case in a non-multi-server install 2023-02-18 18:02:15 -05:00
Isaac Connor
0cf80c2ac0 Add Deleting of Server_Stats rows after 1 day 2023-02-18 18:02:15 -05:00
Isaac Connor
0879252d13 Add Server Stats table and insert into it in zmstats.pl 2023-02-18 18:02:15 -05:00
Isaac Connor
74b8bf3a2a decodeURI when taking password from uri. Always update username/password. 2023-02-18 18:02:15 -05:00
Isaac Connor
853bde63e1 Merge pull request #3662 from ZoneMinder/dependabot/composer/web/firebase/php-jwt-6.0.0 
Bump firebase/php-jwt from 5.0.0 to 6.0.0 in /web
 2023-02-17 10:14:33 -05:00
dependabot[bot]
2412fefdf5 Bump firebase/php-jwt from 5.0.0 to 6.0.0 in /web 
Bumps [firebase/php-jwt](https://github.com/firebase/php-jwt) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/firebase/php-jwt/releases)
- [Changelog](https://github.com/firebase/php-jwt/blob/main/CHANGELOG.md)
- [Commits](https://github.com/firebase/php-jwt/compare/v5.0.0...v6.0.0)

---
updated-dependencies:
- dependency-name: firebase/php-jwt
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-17 14:54:52 +00:00
Isaac Connor
3e34b36ec0 Fix email structure for ios 2023-02-16 17:24:23 -05:00
Isaac Connor
a2e9cc23cb 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:10:41 -05:00
Isaac Connor
ee89169a7b Use reload instead of restart on zone save 2023-02-16 14:10:30 -05:00
Isaac Connor
855ab6f141 Add reload to monitor zmcControl 2023-02-16 14:10:21 -05:00
Isaac Connor
f044d04271 Stop streams when clicking cancel/Save so that we don't log errors trying to access a dead zms. Fixes #3643 2023-02-16 14:10:12 -05:00
Isaac Connor
d750daebbc Fix NewStorage=>self 2023-02-16 12:17:38 -05:00
Isaac Connor
42da035f27 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2023-02-16 11:52:27 -05:00
Isaac Connor
9aa44645dd Hack s3 with LWP to not cache connections so that we don't run out of files 2023-02-16 11:52:16 -05:00
Isaac Connor
f437aadbe6 Update s3fs url parsing to match that in Event 2023-02-16 11:51:11 -05:00
Isaac Connor
07115422e7 Handle case where event has been moved but db not updated. This can happen when using a transaction and the db goes away. 2023-02-16 09:39:54 -05:00
Isaac Connor
c50209f66c Listing dir contents really fills up logs. Make it only report on level 4 2023-02-16 09:30:47 -05:00
Isaac Connor
4b6f47eebd Fixup email structure so that inline images properly display while also having a text version. 2023-02-15 17:41:19 -05:00
Isaac Connor
1a8a84da96 Remove debug when relay not hashed 2023-02-15 15:02:22 -05:00
Isaac Connor
8ec5946791 Add backtrace to value not in values warning 2023-02-15 15:02:11 -05:00
Isaac Connor
c009ef1bbe Fix AlarmFrames validity test 2023-02-15 15:00:23 -05:00
Isaac Connor
71265a8271 Define serversr, stats for simple widget 2023-02-15 15:00:13 -05:00
Isaac Connor
113171e5ee username in session can also be unset 2023-02-15 13:46:34 -05:00
Isaac Connor
ff528e578f Show 0 instead of null in storage disk used column 2023-02-15 11:00:59 -05:00
Isaac Connor
1e77b58409 Don't set NextTimeStamp when we have a change of event. 2023-02-15 11:00:33 -05:00
Isaac Connor
30a75d81d2 Turn off debug, fix frame->frames typo 2023-02-15 10:24:45 -05:00
Isaac Connor
1a215dab3e Handle no frames in data gracefully 2023-02-15 10:20:59 -05:00
Isaac Connor
e31fa4a4c3 Clear action when loading events. 2023-02-14 17:56:55 -05:00
Isaac Connor
40e7f8a517 Handle SESSION[password] not being set which happens when you switch AUTH_RELAY to plain. 2023-02-14 17:10:58 -05:00