Commit Graph

13728 Commits

Author SHA1 Message Date
Isaac Connor 6f59d63e08 Add missing AutoCopy and AutoCopyTo in db creation 2019-09-05 09:55:58 -04:00
Isaac Connor 25198e0eb0 move session_close to after auth so that whatever we do with the session in auth gets saved 2019-09-04 17:53:59 -04:00
Isaac Connor eea1732675 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-09-04 13:39:21 -04:00
Isaac Connor 6b83a62fad allow for StorageId to be 0 2019-09-04 13:35:46 -04:00
Isaac Connor 3bafbf69be
Merge pull request #2698 from connortechnology/fix_auth_persistence_by_regenerating_cookie
Fix auth timing out due to cookie timing out and getting deleted.
2019-09-04 12:20:47 -04:00
Isaac Connor 2993e52652 Fix auth timing out due to cookie timing out and getting deleted. 2019-09-04 12:14:32 -04:00
Isaac Connor f568e0da30 Fix event->id() to event->Id() 2019-09-04 10:11:16 -04:00
Isaac Connor a57c5196f3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-09-04 10:07:31 -04:00
Isaac Connor dde655950f Use locking when deleting an event 2019-09-04 10:07:17 -04:00
Isaac Connor 26670c2df2 Add lock function to write lock an object 2019-09-04 10:07:08 -04:00
Isaac Connor f390a0ca03
Merge pull request #2697 from ZoneMinder/cake-debug-off
In production mode, debug should be 0
2019-09-04 09:59:39 -04:00
Pliable Pixels be99f6a4d6
In production mode, debug should be 0 2019-09-04 08:47:09 -04:00
Isaac Connor 2f7596f179
Merge pull request #2696 from connortechnology/freebsd_arm
fixes #2694
2019-09-03 13:33:26 -04:00
Isaac Connor f46662a062 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-09-03 12:55:51 -04:00
Isaac Connor 16f0ad4f59 Fix Monitorid => MonitorId 2019-09-03 12:55:45 -04:00
Isaac Connor 571082ff95 StorageId clears Path 2019-09-03 12:55:31 -04:00
Isaac Connor 85e0a086b3 fixes #2694 2019-09-03 11:55:37 -04:00
Isaac Connor 4cbe4fc5f0
Fix token auth sessions (#2695)
* If token is present do token based auth and do not do anything with session

* update HostController.  Use config constants, don't use sessions

* Remove Session from the components list

* spacing

* Remove Session from App Components list.

* Move APIEnabled check to the api from auth.php

* Rework auth.  login using username and password only occurs on login action now.  Including auth.php should not touch the session.  auth_hash logins no longer touch the session.  replace userLogin with a function called validateUser which matches the semantics of validateToken.

* remove debugging

* Add session storage if stateful query param is on, but only for LEGACY_API_AUTH

* fix mUser to username, etc.

* shuffle lines

* use  instead of session when generating auth hash.

* Add docs regarding the use of cookies and stateful query param

* Only open/close session if we are clearing a session var

* Use zm_session_start instead of session_start

* Should use zm_session_start instead of session_start

* document that zm_session_start should be called previously to session_regenerate_id

* Don't actually write out the session when generating auth hashes.  Means they should never actually persist.

* More backticking of SQL

* have to add authhash to session on login

* restore username&password login for all urls

* fix

* fixes

* Load use from session when it exists
2019-09-03 11:44:58 -04:00
Isaac Connor 92bc1791f5 fix accidentally removed code 2019-09-03 11:33:13 -04:00
Isaac Connor 50aa0108e5 Add authhash to session 2019-09-03 11:33:02 -04:00
Isaac Connor a384e978c8 don't load user from session if we have already gotten it from elsewhere 2019-09-03 11:19:42 -04:00
Isaac Connor b84d005d8f Load use from session when it exists 2019-09-03 10:54:34 -04:00
Isaac Connor d1ac88d301 Now you can have a subpath under the S3 bucket 2019-08-29 17:55:39 -04:00
Isaac Connor ab0a939550 Turn off event dir creation on S3. It's not neccessary. Allow s3fs:// at the beginning of the S3 url 2019-08-29 11:27:58 -04:00
Isaac Connor 99a2ddba63 Add listing of Secondary Storage area in events list 2019-08-29 11:27:06 -04:00
Isaac Connor 6b9e8bec69 Add logging of delete events 2019-08-29 11:26:32 -04:00
Isaac Connor ef5497cba8 If we have an ajax request, don't do actions. 2019-08-29 11:26:14 -04:00
Isaac Connor a4b057fa2b Upgrade Event object to use the common Object methods. Add deleting files from Secondary storage 2019-08-29 11:25:37 -04:00
Isaac Connor 93d642304e Add debug line for aws credentials 2019-08-29 09:42:20 -04:00
Isaac Connor c80ef0e0ab spacing 2019-08-28 12:20:03 -04:00
Isaac Connor bd3395ac98 introduce VideoStore::write_packet to refactor out duplicated code. Add the ability to receive multiple packets from audio encoder per input packet 2019-08-28 12:19:54 -04:00
Isaac Connor efb8711c02 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-28 11:43:59 -04:00
Isaac Connor 307fad72be Default to using V4 Signature 2019-08-28 11:43:46 -04:00
Arnout Engelen 42edad1e8c Tweaks to the ubuntu installation instructions (#2688)
* Tweaks to the ubuntu installation instructions

I recently walked a new user through the Ubuntu installation, and noticed some
things that were confusing to him that would be easy to fix.

* Use release names as well as numbers
2019-08-28 10:53:24 -04:00
Isaac Connor 5f0080ef92 Fix crash when using auth_relay=none 2019-08-28 10:34:30 -04:00
Isaac Connor 64d024b0c0 Fix spacing 2019-08-28 10:33:18 -04:00
Isaac Connor 505a041c88 Don't add a final db frame to the event, because there is no jpg for the frame. I don't know why this code was originally added. 2019-08-28 10:17:23 -04:00
Isaac Connor 034985128a Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-08-28 09:20:16 -04:00
Isaac Connor 59940ab675 report pixformat names instead of just #'s on error 2019-08-28 09:19:57 -04:00
Isaac Connor c6dd3ffbec tabs to spaces 2019-08-28 09:19:09 -04:00
Isaac Connor 320bf823c5 Don't report errors when creating monitor symlink when it already exists 2019-08-28 09:18:33 -04:00
Isaac Connor 235ec2bafa Merge branch 'master' of github.com:/ZoneMinder/zoneminder 2019-08-28 09:03:54 -04:00
Isaac Connor 403ece42dd fix backticks 2019-08-28 09:03:45 -04:00
Isaac Connor 91ef4f5932 x264 encode works on arm now, so let people choose it 2019-08-28 08:51:42 -04:00
Isaac Connor 8043ba8092 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-08-27 16:49:12 -04:00
Paulius Gedrikas 9b3fecd7a0 Fix iOS autocapitalizing username field on login (#2687)
I propose removing the auto-capitalization from the username field for Safari under iOS by adding autocapitalize="none" to the username form field. Usernames rarely start with a capital letter, so I think this would be a usability improvement for users logging in through iPhones or iPads.

Having to login to ZM under iOS, I've been frustrated at the need to always press on the Caps Lock key on the virtual keyboard to disable the capitalization of the first letter. This is because iOS auto capitalized non-password and non-email HTML form fields. ZM is also case sensitive, so "Admin" will not work if the main user is "admin".
2019-08-27 16:49:03 -04:00
Isaac Connor dfb65d23bf Fix eslint warnings 2019-08-27 16:48:42 -04:00
Isaac Connor cdb8e056b6 Turn off debug in Event 2019-08-27 15:20:30 -04:00
Isaac Connor 41fb11d776 Fix Arched lacking () so not working 2019-08-27 15:19:38 -04:00
Isaac Connor d7d2c140a0 Use index to server hosting storage where event is saved to talk to zms 2019-08-27 15:19:18 -04:00