Commit Graph

1072 Commits

Author SHA1 Message Date
Isaac Connor 396be10d6f Merge branch 'master' into zma_to_thread 2019-08-22 12:57:00 -04:00
Andrew Bauer d75d64280d
Update zoneminder.spec 2019-08-11 15:03:15 -05:00
Andrew Bauer 255f606ebf
bump rpm specfile 2019-07-07 07:33:50 -05:00
Isaac Connor 73b5d506b4 Reference /run/zm instead of /var/run/zm because systemd-tmpfiles complains about it 2019-06-24 09:33:54 -04:00
Andrew Bauer 645d13c752 bump rpm specfile to 1.33.9 2019-06-23 12:16:15 -05:00
Isaac Connor 0699b21017 Remove libjson-any-perl as a dependency. Fixes #2630 2019-06-03 09:45:50 -04:00
Isaac Connor 94f2c76562 fix trailing whitespace 2019-05-27 12:31:53 -04:00
Isaac Connor c4d76f03c9 Introduce ZM_PATH_SHUTDOWN to cmake config 2019-05-27 12:09:32 -04:00
Isaac Connor 3b5b63d9cb add libx264-155 to possible dependencies. Fixes #2596 2019-05-24 14:09:46 -04:00
Isaac Connor 4b1284b8ad fix merge 2019-05-24 13:57:40 -04:00
Isaac Connor 1ddd5b1f74 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-05-24 13:56:30 -04:00
Pliable Pixels fc27393a96 Replace MySQL Password() with bcrypt, allow for alternate JWT tokens (#2598)
* added sha1 and bcrypt submodules

* added bcrypt and sha to src build process

* added test sha1 and bcrypt code to validate working

* bcrypt auth migration in PHP land

* added include path

* add sha source

* added bcrypt to others

* put link_dir ahead of add_executable

* fixed typo

* try add_library instead

* absolute path

* absolute path

* build bcrypt as static

* move to wrapper

* move to fork

* logs tweak

* added lib-ssl/dev for JWT signing

* Moved to openSSL SHA1, initial JWT plugin

* removed vog

* fixed SHA1 algo

* typo

* use php-jwt, use proper way to add PHP modules, via composer

* fixed module path

* first attempt to fix cast error

* own fork

* own fork

* add composer vendor directory

* go back to jwt-cpp as PR merged

* moved to jwt-cpp after PR merge

* New token= query for JWT

* Add JWT token creation, move old code to a different function for future deprecation, simplified code for ZM_XX parameter reading

* JWT integration, validate JWT token via validateToken

* added token validation to zms/zmu/zmuser

* add token to command line for zmu

* move decode inside try/catch

* exception handling for try/catch

* fix db read, forgot to exec query

* remove allowing auth_hash_ip for token

* support refresh tokens as well for increased security

* remove auth_hash_ip

* Error out if used did not create an AUTH_HASH_SECRET

* fixed type conversion

* make sure refresh token login doesn't generate another refresh token

* fix absolute path

* move JWT/Bcrypt inside zm_crypt

* move sha headers out

* move out sha header

* handle case when supplied password is hashed, fix wrong params in AppController

* initial baby step for api tab

* initial plumbing to introduce token expiry and API bans per user

* remove M typo

* display user table in api

* added revoke all tokens code, removed test code

* use strtoul for conversion

* use strtoul for conversion

* use strtoul for conversion

* more fixes

* more fixes

* add mintokenexpiry to DB seek

* typo

* add ability to revoke tokens and enable/disable APIs per user

* moved API enable back to system

* comma

* enable API options only if API enabled

* move user creation to bcrypt

* added password_compat for PHP >=5.3 <5.5

* add Password back so User object indexes don't change

* move token index after adding password

* demote logs

* make old API auth optional, on by default

* make old API auth mechanism optional

* removed stale code

* forgot to checkin update file

* bulk overlay hash mysql encoded passwords

* add back ssl_dev, got deleted

* fix update script

* added token support to index.php

* reworked API document for new changes in 2.0

* Migrate from libdigest to crypt-eks-blowfish due to notice

* merge typo

* css classess for text that disappear

* fixed html typo

* added deps to ubuntu control files

* spaces

* removed extra line

* when regenerating using refresh tokens, username needs to be derived from the refresh token, as no session would exist

* add libssl1.0.0 for ubuntu 16/12

* small API fixes

* clean up of API, remove redundant sections

* moved to ZM fork for bcrypt

* whitespace and google code style

* regenerate auth hash if doing password migration

* dont need AUTH HASH LOGIN to be on

* Add auth hash verification to the user logged in already case

* fix missing ]

* reject requests if per user API disabled
2019-05-24 13:48:40 -04:00
Isaac Connor 34370e0060
test for error code from db creation and if there is an error, die with an error code. (#2611) 2019-05-24 13:47:07 -04:00
Isaac Connor 2ce2381269 Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement 2019-05-19 08:45:42 -04:00
Pliable Pixels 33db7e1e35 add libssl1.0.0 for ubuntu 16/12 2019-05-18 13:47:31 -04:00
Pliable Pixels 304192472d removed extra line 2019-05-17 12:02:24 -04:00
Pliable Pixels 682d95470d spaces 2019-05-17 11:47:20 -04:00
Isaac Connor 88a58243bc Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement 2019-05-17 11:24:40 -04:00
Pliable Pixels e2dd11fdd4 added deps to ubuntu control files 2019-05-17 11:21:07 -04:00
Isaac Connor e9ff1f46f1 Add missing deps to ubuntu versions of control 2019-05-17 11:13:45 -04:00
Isaac Connor 93aeceecfc Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement 2019-05-17 10:18:15 -04:00
Isaac Connor 84b389a2bc Merge branch 'test_error_db_creation' into storageareas 2019-05-17 10:16:26 -04:00
Isaac Connor 17e0b4ac4b test for error code from db creation and if there is an error, die with an error code. 2019-05-17 08:34:19 -04:00
Pliable Pixels 915e9f05a9 merged fifo changes 2019-05-16 16:14:06 -04:00
Pliable Pixels 0e72080c4a Migrate from libdigest to crypt-eks-blowfish due to notice 2019-05-16 09:37:11 -04:00
Pliable Pixels 4a2ac470ee add back ssl_dev, got deleted 2019-05-13 14:32:48 -04:00
Pliable Pixels e9f843f297 bulk overlay hash mysql encoded passwords 2019-05-13 14:29:24 -04:00
Pliable Pixels 87e407aa90 forgot to checkin update file 2019-05-13 10:31:09 -04:00
Isaac Connor 74095963cc Merge branch 'master' into storageareas 2019-05-12 19:39:09 -04:00
Pliable Pixels 7603e94e90 added lib-ssl/dev for JWT signing 2019-05-03 16:57:43 -04:00
Andrew Bauer 74bd812632 rpm packaging - buildrequire zlib-devel 2019-05-03 09:07:19 -05:00
Isaac Connor 8b1565c41d Change pid path to /run/zm/zm.pid instead of /var/run/zm/zm.pid. systemd now complains about the use of a legacy directory, so this quiets that. 2019-05-02 10:52:19 -04:00
Andrew Bauer ed02ef39f1
bump rpm specfile 2019-04-30 18:11:38 -05:00
Isaac Connor 077ad75516 Merge branch 'storageareas' into origin/zma_to_thread 2019-04-25 12:41:48 -04:00
Andrew Bauer 4b2fe5c3c7
Update zoneminder.spec 2019-04-07 18:21:52 -05:00
Andrew Bauer 593f1571e3
add zmrecover.pl to rpm specfile 2019-03-30 08:57:04 -05:00
Andrew Bauer 1d3617c1cf
Rem reference to AUTHORS since it no longer exists 2019-03-30 08:43:46 -05:00
Andrew Bauer e3caf38a72
Update zoneminder.spec 2019-03-30 08:20:18 -05:00
Andrew Bauer 8556e13504
Update zoneminder.spec 2019-03-30 08:16:46 -05:00
Isaac Connor a9e2011727 Merge branch 'storageareas' into zma_to_thread 2019-02-13 12:24:38 -05:00
Isaac Connor b8bf91bec6 include libswresample-ffmpeg1 in depends 2019-01-07 09:20:58 -05:00
Andrew Bauer 3258d8e590 remove ZM_DIR_IMAGES (#2374) 2018-12-29 09:52:58 -05:00
Isaac Connor 28dafd5931 Merge branch 'storageareas' into zma_to_thread 2018-12-26 12:02:00 -05:00
Isaac Connor 6ee72aa2d9 Implement libswresample support as an alternative to libavresample, which is deprecated 2018-12-20 14:06:56 -05:00
Isaac Connor 3f1e495872 Add libswresample to dependencies 2018-12-20 13:41:09 -05:00
Andrew Bauer c1f46a9cb0
Update README.httpd 2018-12-15 16:29:44 -06:00
Andrew Bauer 5a6e700c45
rpm packaging - update fcgiwrap socket location
I pushed a new fgciwrap package to Fedora and the socket file in the package is in a different location. See: https://bugzilla.redhat.com/show_bug.cgi?id=1655281
2018-12-14 20:27:12 -06:00
Andrew Bauer af6b709ae1 bump to 1.33.0 development 2018-12-11 09:28:48 -06:00
Andrew Bauer c3620672b3 1.32.3 release 2018-12-08 08:19:55 -06:00
Andrew Bauer 16318ca3ef
Update zoneminder.spec 2018-12-07 09:59:28 -06:00