mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-24 16:51:47 -04:00
Code Issues Packages Projects Releases Wiki Activity
15,813 Commits 80 Branches 104 Tags
4d5d2ecd5d96ae59dcb1ae51fbf3cd32294dfe2b
Commit Graph

82 Commits

Author SHA1 Message Date
Peter Keresztes Schmidt
8f980a1168 Convert NULL/0 to nullptr 
The 0 -> nullptr changes should definitely improve readability.
 2020-08-26 22:03:40 +02:00
Isaac Connor
434f34f027 use delete[] instead of delete. 2020-04-30 11:04:55 -04:00
Isaac Connor
a6ee817bc4 Fix auth by hash 2020-04-28 19:00:42 -04:00
Isaac Connor
e21ffbea7d Merge branch 'fix_zms' 2020-04-26 18:43:39 -04:00
Isaac Connor
ae9a5766f5 Merge branch 'release-1.34' into fix_zms 2020-04-26 18:19:30 -04:00
Isaac Connor
b0c5abc2c2 Quiet compiler warnings. 2020-04-24 17:51:00 -04:00
Pliable Pixels
9b77f77ac3 better logs 2020-04-23 11:09:39 -04:00
Isaac Connor
8193e4ea4e replace snprintf with hex table lookup for speed 2020-04-06 11:46:14 -04:00
Isaac Connor
1e38ba871d Merge branch 'master' into fix_use_of_sprintf 2020-04-06 11:23:12 -04:00
Isaac Connor
c6e0b9be39 Merge branch 'master' into fix_use_of_sprintf 2020-04-06 11:21:43 -04:00
Isaac Connor
98e9355723 snprintf will put the terminator in. We don't have to. 2020-04-06 11:21:02 -04:00
hax0kartik
face73ad7e Fix compilation 2020-04-05 22:45:47 -04:00
Isaac Connor
2827ba38cd use snprintf instead of sprintf. Fix putting a \0 terminator 2020-04-05 13:41:03 -04:00
Isaac Connor
9441fe833f satisfy cpplint 2020-04-05 13:23:12 -04:00
Isaac Connor
3a129a8818 Merge pull request #2874 from hax0kartik/2810-libjwt 
Add libjwt and remove gnutls-openssl wrapper
 2020-03-06 14:48:45 -05:00
Isaac Connor
835966eb24 Merge pull request #2874 from hax0kartik/2810-libjwt 
Add libjwt and remove gnutls-openssl wrapper
 2020-03-05 15:30:27 -05:00
hax0kartik
2091ad8c92 Add libjwt and remove gnutls-openssl wrapper 2020-03-05 09:29:27 -08:00
Pliable Pixels
54c14db863 better logs 2020-03-01 14:02:44 -05:00
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