Commit Graph

112 Commits

Author SHA1 Message Date
Isaac Connor
e5c194e9ee Fix return 403 status code 2019-07-26 12:22:04 -04:00
Isaac Connor
0643108ba4 Use fputs instead of fprintf. Spacing and google code style changes 2019-07-26 10:53:48 -04:00
Isaac Connor
9a31f8792c return proper error codes when failed auth or fail permissions 2019-07-19 13:55:35 -04:00
Pliable Pixels
915e9f05a9 merged fifo changes 2019-05-16 16:14:06 -04:00
Mitch Capper
eb005e8b9c FIFO support for zoneminder zone debugging (#2594)
Adds fifo options for diagnostic images for much lower impact diagnostics mode.  Diagnostic images are only written when there is a client listening for them (otherwise they are skipped).  Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion.  This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
2019-05-16 15:37:03 -04:00
Pliable Pixels
21710b6e49 demote logs 2019-05-12 15:45:39 -04:00
Pliable Pixels
27e6e46f84 remove allowing auth_hash_ip for token 2019-05-08 12:11:32 -04:00
Pliable Pixels
b293592e4c added token validation to zms/zmu/zmuser 2019-05-08 10:55:32 -04:00
Isaac Connor
24665264a2 Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2019-03-05 20:16:05 -05:00
Isaac Connor
903f5af1ef invalid parameters should be a debug not a warning 2019-03-04 13:35:36 -05:00
Isaac Connor
6156aa2af9 Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2019-02-15 10:49:06 -05:00
Isaac Connor
31a11a6992 init log earlier in zms 2019-02-13 11:34:47 -05:00
Steve Gilvarry
924d5235d0 Validate zmu Username and Password lengths (#2484)
* Validate zmu Username and Password lengths
Ensure user provided values are not larger than allowed and error if
they are, therefore further preventing overflow.

* Check username and password functions for zmu and zms

* Check username and password functions for zmu and zms
2019-02-13 10:40:43 -05:00
Isaac Connor
fe444218cc Implement replay mode = none in zms. This mode was only handled for video html tag viewing. 2018-09-28 12:31:53 -04:00
Isaac Connor
dd479c9e55 remove () around return 2018-07-04 14:50:47 -04:00
Isaac Connor
87d9fc447e google code style 2018-06-01 11:27:53 -04:00
Andy Bauer
678503b992 fix ftbs on el7 2018-04-24 12:16:19 -05:00
Isaac Connor
e56cf0b31c switch to uint64_t for event_id because long long can actually be 128 bit 2018-04-17 13:57:19 -04:00
Isaac Connor
f9f78e9aa3 Convert event_id to a 64bit unsigned int 2018-04-12 13:40:11 -07:00
Isaac Connor
47ec0abf11 spacing 2018-03-02 18:27:03 -08:00
Isaac Connor
ef72e585b9 Include id in the user object 2018-02-13 05:28:00 -05:00
Isaac Connor
70d43d2d27 fix strncpy calls 2017-12-12 13:42:48 -05:00
Isaac Connor
752990bb0f improve zms logging 2017-11-21 23:55:53 -05:00
Isaac Connor
48e9e12063 assume source=monitor when a monitor_id is specified 2017-08-24 10:13:46 -04:00
Isaac Connor
a81ff85fbb add ffmpeg decoding of a .mp4 to get the frames 2017-08-23 15:05:44 -04:00
Isaac Connor
2a71b0f170 Merge branch 'storageareas' into work_on_zms 2017-07-06 12:39:44 -04:00
Isaac Connor
c3c6459052 Merge branch 'montagereview_rework' into storageareas 2017-07-05 15:34:02 -04:00
Isaac Connor
95ba837bda fix braces 2017-07-05 14:25:23 -04:00
Isaac Connor
834d1dddfa fix braces 2017-07-05 14:10:09 -04:00
Isaac Connor
62d6394923 finish roughing in ffmpeg_input 2017-06-26 16:55:49 -04:00
Isaac Connor
b73c0ba978 rough in zm_ffmpeg_input and split out eventstream 2017-06-22 17:58:32 -04:00
Andrew Bauer
ccc2cc832f Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into mastertheknife-armv7_neon 2017-05-10 07:45:58 -05:00
Isaac Connor
8251e7ac03 fix uridecode(password) to uridecode(value) 2017-05-05 09:47:15 -04:00
Isaac Connor
2220b04203 need to include zm_monitorstream.h now 2017-04-10 21:52:29 -04:00
Andrew Bauer
b609b9ad4c Merge pull request #1826 from connortechnology/uri_decode_in_zms
Uri decode in zms
2017-04-03 20:13:30 -05:00
Isaac Connor
8b7acb68a3 fix password and add debug 2017-03-29 20:07:58 -04:00
Isaac Connor
a33a8402ef Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into neon
Conflicts:
	src/zmf.cpp
	src/zms.cpp
2017-03-24 12:14:16 -04:00
Isaac Connor
0a1b2eab01 Merge branch 'uri_decode_in_zms' into storageareas 2017-03-20 15:13:19 -04:00
Isaac Connor
f5dc896a45 missed one case 2017-03-20 15:12:23 -04:00
Isaac Connor
a546c9e37f merge uri_decode in zms 2017-03-20 12:00:14 -04:00
Isaac Connor
9f30ccfa75 Use new UriDecode function to decode username and password 2017-03-20 11:16:39 -04:00
Kfir Itzhak
e02e033cc8 Renamed ssedetect() to hwcaps_detect() and added ARM Neon and AVX2 detection 2017-03-19 02:05:01 +02:00
Isaac Connor
5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer
254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor
48d9f31fa9 add more debug 2016-09-28 09:08:00 -04:00
Isaac Connor
079aa827c5 whitespace 2016-09-26 20:08:45 -04:00
Isaac Connor
59406fd03a Merge branch 'master' into storageareas 2016-04-28 09:24:36 -04:00
Isaac Connor
24e3306955 master master 2016-04-28 09:20:56 -04:00
abi
9aff84fbbb unbreak build under FreeBSD 32 bit II 2016-04-26 21:53:50 +03:00
Isaac Connor
03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00