Commit Graph

228 Commits

Author SHA1 Message Date
Isaac Connor 484ff7dbaa Fail postinst if zmupdate fails 2021-04-19 11:51:35 -04:00
Isaac Connor 93e4691b08 remove liblivemedia as a dependency. We have gone another way 2021-03-10 16:17:26 -05:00
Isaac Connor 9beaf613bf Add liblivemedia as a dependency to build rtsp_server 2021-03-02 09:05:58 -05:00
Isaac Connor 836ef731c1 Don't use libjquery-js 2021-03-01 16:47:18 -05:00
Isaac Connor be95bd2fa7 deprecate python-sphinx in favour of python3-sphinx. Remove mp4v2 and libx264 2021-01-28 16:17:15 -05:00
Isaac Connor 4dcce4ac95 Merge branch 'rtsp_server' 2021-01-26 14:22:10 -05:00
Andrew Bauer 0b35a6f09a remove mootools from debian packaging 2021-01-18 07:59:54 -06:00
Isaac Connor a1917d83d0 Merge branch 'master' into zma_to_thread 2020-12-22 19:52:09 -05:00
Isaac Connor 2936d64b91 Always take ownership of dirs in /var/cache/zoneminder. The previous behaviour would have only done it on a new install. Fixes #3096 2020-12-18 10:54:08 -05:00
Isaac Connor b261fbb397 Merge branch 'master' into zma_to_thread 2020-12-07 16:26:26 -05:00
Isaac Connor 7ef34bce7b Include new fonts dir in install 2020-12-03 13:30:51 -05:00
Isaac Connor df783f4835 Merge branch 'master' into zma_to_thread 2020-11-12 12:53:55 -05:00
Isaac Connor 9a9f80c15c show which user we are updating permissions for 2020-10-28 14:07:29 -04:00
Isaac Connor 59884375fa Add references permission so that our zmupdate can add foreign keys 2020-10-28 09:23:46 -04:00
Isaac Connor a39a656373 Merge branch 'master' into zma_to_thread 2020-09-29 11:02:40 -04:00
Isaac Connor 3d3dde22c4 Use zm_session_start 2020-08-25 11:31:06 -04:00
Isaac Connor 869860bb26 Merge branch 'master' into zma_to_thread 2020-07-21 17:49:39 -04:00
Isaac Connor 7575afc8d5 Merge branch 'master' into zma_to_thread 2020-07-21 17:38:32 -04:00
Isaac Connor 973450425d Use /run/zm instead of /var/run/zm 2020-07-11 10:44:06 -04:00
Isaac Connor 1b9402239a Add libvncclient0 as an option for jessie 2020-06-15 14:59:33 -04:00
Isaac Connor 0412f04592 Merge branch 'release-1.34' 2020-05-08 17:25:14 -04:00
Isaac Connor f101e58480 Split db user creation and permission granting into two commands, as needed by newer mysql. Also auto-install apache rewrite module for api. 2020-05-08 17:20:41 -04:00
Isaac Connor 4ff341a0f5 Merge branch 'master' into zma_to_thread 2020-05-02 18:03:42 -04:00
Isaac Connor 593ea24cc6 add libvnc dependencies for VNC monitor type 2020-03-30 12:42:27 -04:00
Isaac Connor 8dfe7460f3 revert bogus change 2020-01-11 10:21:29 -05:00
Isaac Connor 80c95d5afe Merge branch 'master' into wip_axisv2 2020-01-10 17:20:32 -05:00
Isaac Connor c3f8d9c364 add php5-json as a dependency 2020-01-07 12:08:08 -05:00
Isaac Connor 06f846c88b add php-json to depends 2020-01-02 16:52:09 -05:00
Isaac Connor 09fcbad666 Merge branch 'master' into zma_to_thread 2019-11-30 14:59:39 -05:00
Isaac Connor 0f1b186eb1 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-10-18 09:29:42 -04:00
Isaac Connor 0e6e572e45 add libdatetime-perl to depends. Is used in control modules 2019-10-17 16:35:23 -04:00
Isaac Connor 61a7c008eb Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-09-25 10:36:52 -04:00
Isaac Connor 240a355b72 list me as maintainer and uploader 2019-09-21 12:10:33 -04:00
Isaac Connor 396be10d6f Merge branch 'master' into zma_to_thread 2019-08-22 12:57:00 -04:00
Isaac Connor f813741730 Add maxage 7 to logrotate config so that it will clear out all the zms_e logs. 2019-08-16 11:31:27 -04: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
Isaac Connor 0699b21017 Remove libjson-any-perl as a dependency. Fixes #2630 2019-06-03 09:45:50 -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 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 84b389a2bc Merge branch 'test_error_db_creation' into storageareas 2019-05-17 10:16:26 -04:00