ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,036 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

64 Commits

Author SHA1 Message Date
Isaac Connor 5f0080ef92 Fix crash when using auth_relay=none 2019-08-28 10:34:30 -04:00
Isaac Connor c7b6db9be7 Put backticks around all columns and tables in sql to deal with mysql 8 2019-08-14 16:18:21 -04:00
Pliable Pixels a9d01ba3d2 Alarm api (#2665) 
* fixed alarm api to use tokens if present

* clearer debug logs for tokens

* space
 2019-07-17 20:38:58 -04:00
Pliable Pixels 67168a2387 demote token log (#2663) 2019-07-12 14:31:39 -04:00
Pliable Pixels 21710b6e49 demote logs 2019-05-12 15:45:39 -04:00
Pliable Pixels cc0d23ce4e move token index after adding password 2019-05-12 15:01:49 -04:00
Pliable Pixels 9a8aa5453b add Password back so User object indexes don't change 2019-05-12 14:48:23 -04:00
Pliable Pixels 8499958767 typo 2019-05-12 05:57:17 -04:00
Pliable Pixels 225893fcd6 add mintokenexpiry to DB seek 2019-05-12 05:50:19 -04:00
Pliable Pixels ae14be916c initial plumbing to introduce token expiry and API bans per user 2019-05-11 13:39:40 -04:00
Pliable Pixels 4ab0c35962 move JWT/Bcrypt inside zm_crypt 2019-05-08 16:45:28 -04:00
Pliable Pixels c41a2d067c fixed type conversion 2019-05-08 14:29:44 -04:00
Pliable Pixels bc050fe330 support refresh tokens as well for increased security 2019-05-08 13:38:42 -04:00
Pliable Pixels 3c6d0131ff fix db read, forgot to exec query 2019-05-08 12:06:37 -04:00
Pliable Pixels 04c3bebef9 exception handling for try/catch 2019-05-08 11:44:15 -04:00
Pliable Pixels 3a67217972 move decode inside try/catch 2019-05-08 11:29:34 -04:00
Pliable Pixels b293592e4c added token validation to zms/zmu/zmuser 2019-05-08 10:55:32 -04:00
Pliable Pixels ca2e7ea97c logs tweak 2019-05-03 12:01:13 -04:00
Pliable Pixels 72325d12b7 move to wrapper 2019-05-03 11:40:35 -04:00
Pliable Pixels 1ba1bf0c45 added test sha1 and bcrypt code to validate working 2019-05-01 13:18:51 -04:00
Isaac Connor b794c2ca20 fix crash by checking username without checking if it is NULL 2019-03-18 12:01:51 -04: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 6d7660cdbd Now that we are dynamically allocating safer_username and safer_password, need to free them. Also, don't strlen them multiple times for efficiency 2019-01-25 08:46:40 -05:00
Steve Gilvarry a81e7c5221 Safer_username and safer_login should be based on the username and login (#2482) 
(lengths * 2)+1. Control input lengths at user input
 2019-01-25 08:33:30 -05:00
Isaac Connor 2b21fe3640 increase sql var size to MED to hold the largest possible sql string. 2019-01-16 11:48:31 -05: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 64816aa005 fixes from cppcheck. 2017-11-18 16:00:10 -05:00
Isaac Connor 71f13a7c9a optimisations/fixes from cppcheck 2017-11-12 10:27:47 -05:00
Isaac Connor d3ec50aa69 various fixes plus use global db functions in logger 2017-07-06 17:45:23 -04: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 e423e0802c put back the needed sql and add a lot of debugging 2016-09-29 12:22:32 -04:00
Isaac Connor 8bc7b9562f introduce config option ZM_AUTH_HASH_TTL which is the # of hours to make an auth hash valid for 2016-09-29 10:04:53 -04:00
Isaac Connor 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
Linwood-F 6aca6c8d26 Demote user auth info message to debug 2015-08-09 12:16:01 -04:00
Isaac Connor 6e22278f74 password might be null when auth_relay is none. 2014-06-27 12:47:56 -04:00
Isaac Connor 8f4fb8bb64 fix mysql_escape_String call. Must use strlen, not sizeof 2014-06-26 14:44:37 -04:00
Isaac Connor 20bccdf431 use the size of the username and password when calling mysql_escape_string 2014-06-25 16:23:10 -04:00
Isaac Connor 0592276f53 fix mysql_escape_string calls after referring to docs 2014-06-24 11:22:08 -04:00
Isaac Connor 93aed26a00 escape username and password inside zm_user 
by rogerroger288
 2014-06-05 15:18:02 -04:00
Andy 4e9698ae13 Fix for Issue #88 - ZMS crashing 
Previously, systems without gnutls were computing auth_md5 to be twice the size of what it was defined to be, thus causing zms to crash. The for loop at line 227 builds auth_md5 by looping every "2j", which means the upper limit (md5len) should be half the desired size of auth_md5.
 2013-08-28 07:22:41 -05:00
Isaac Connor cdac403fb1 Merge ../zum into develop 
Conflicts:
	AUTHORS
	configure.ac
	db/zm_create.sql.in
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/zmupdate.pl.in
	src/Makefile.am
	src/zm_buffer.cpp
	src/zm_config_defines.h
	src/zm_event.cpp
	src/zm_ffmpeg.h
	src/zm_ffmpeg_camera.cpp
	src/zm_image.cpp
	src/zm_jpeg.h
	src/zm_local_camera.cpp
	src/zm_logger.cpp
	src/zm_mem_utils.h
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_mpeg.cpp
	src/zm_remote_camera_http.cpp
	src/zm_remote_camera_rtsp.cpp
	src/zm_rtsp.cpp
	src/zm_sdp.cpp
	src/zm_sdp.h
	src/zm_stream.cpp
	src/zm_thread.cpp
	src/zm_thread.h
	src/zm_threaddata.cpp
	src/zm_user.cpp
	src/zm_user.h
	src/zm_utils.cpp
	src/zm_zone.cpp
	src/zm_zone.h
	web/includes/actions.php
	web/lang/big5_big5.php
	web/lang/cn_zh.php
	web/lang/cs_cz.php
	web/lang/de_de.php
	web/lang/dk_dk.php
	web/lang/en_gb.php
	web/lang/es_ar.php
	web/lang/et_ee.php
	web/lang/fr_fr.php
	web/lang/he_il.php
	web/lang/hu_hu.php
	web/lang/it_it.php
	web/lang/ja_jp.php
	web/lang/nl_nl.php
	web/lang/pl_pl.php
	web/lang/pt_br.php
	web/lang/ro_ro.php
	web/lang/ru_ru.php
	web/lang/se_se.php
	web/skins/classic/js/skin.js
	web/skins/classic/views/js/monitor.js.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/zone.php
 2013-07-25 11:49:55 -04:00
Isaac Connor ce61512a0d gnutls changes from ubuntu package 2013-04-29 15:32:55 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00
stan 8dd2bbfc17 Support gnutls md5 generation 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3660 e3e1d417-86f3-4887-817a-d78f3d33393f
 2012-07-04 09:00:20 +00:00
stan 7a08ab3c24 Added in some includes that are required on some systems. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3489 e3e1d417-86f3-4887-817a-d78f3d33393f
 2011-08-03 11:31:06 +00:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan 46d777398e Updated to use fixed buffer sizes rather than relying on o/s defined. 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3189 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 12:22:35 +00:00
stan ca4358bfd6 Initial libgcrypt to remove warning in zms and zmu 
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3188 e3e1d417-86f3-4887-817a-d78f3d33393f
 2010-11-11 12:11:06 +00:00