Commit Graph
169 Commits
Author SHA1 Message Date
Mark Brugnoli-Vinten 1ca32862a9 Resolving issue #1920 (#1922)
* Resolving issue #1920

* Minor QA issue
2018-09-14 20:59:52 -05:00
cigamit 5eee727f78 Resolving Issue #553
Aggregated graph does not belong to host
2018-08-19 20:13:34 -05:00
cigamit 15b90d52d8 Revert "Fixes issue 1717 and others (#1775)"
This reverts commit ca23733949.
2018-08-16 20:19:19 -05:00
Mark Brugnoli-Vinten ca23733949 Fixes issue 1717 and others (#1775)
* First round of changes for #1717

* Various QA fixes

* Further round of QA

* Add Content-Type to headers

* Another round of QA

* Allow full screen changepassword

* Redirect to permission denied page instead of displaying local message
2018-08-16 18:42:49 -05:00
cigamit a0b0cb93d3 Correct two minor issues with no-auth 2018-08-16 07:20:09 -05:00
Mark Brugnoli-Vinten 29bed92dc3 Resolving Issue #1824 (#1825)
* Resolving issue #1824

* Fix more fixes for REMOTE_ADDR
2018-08-11 11:08:27 -05:00
cigamit 2de208331f Resolving multiple issues with guest and template accounts 2018-08-07 18:22:31 -05:00
cigamit 93c27bb0be Resolving Issue #1810
Correct SQL errors with authentication set to no authentication
2018-08-07 07:33:04 -05:00
cigamit e0f10ef02f One additional possible option to the normalized template
If the template is not found, indicate as such to aid in debugging.
2018-08-02 21:06:30 -05:00
cigamit 75189c61f9 Resolving Issue #1761
- Graph management shows bogus template names
- Additionally, allow Multi-selects to have a reasonable width
- For Non-Templated and Template Not Found, properly show those things
as select items in the filter.
2018-07-30 20:43:18 -05:00
Mark Brugnoli-Vinten ed57331dfd Fixes for Issue 1729 and 1730 (#1747)
* Fixes QA issues with upgrades from older versions

* Redirect install/index.php to install/install.php

* Further QA fixes

* Ensure upgrade matches new password field length

* Add 'Installation In Progress' message

* Fix QA issues
2018-07-25 08:45:41 -04:00
cigamit 7468ad7d4b Additional reserved work in MySQL 8.x
The word "locked" is now a reserved word in MySQL 8.x
2018-06-02 08:55:30 -05:00
cigamit f89ab3b3bc Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x
# Conflicts:
#	auth_login.php
#	data_sources.php
#	graphs_new.php
#	include/auth.php
#	lib/api_tree.php
#	lib/html_form_template.php
#	lib/html_tree.php
#	lib/template.php
#	permission_denied.php
#	poller_automation.php
#	tree.php
2018-03-25 11:08:00 -05:00
cigamit c1c095cbee Resolve issue related to #1457 2018-03-21 17:20:12 -05:00
Tony Roman 1ce66b5fde Merge branch 'develop' into feature/1.2.x 2018-02-25 20:12:19 -05:00
cigamit 8b5d789213 Resolve issues with messaging
- Discovered in QA
- Secpass password verification does not return meaningful error
messages
- Missing some i18n in login verification process
- Return missing function
- Correct customer error message instances to new display output
- Minor audit of functions for readability
2018-02-24 23:25:57 -06:00
cigamit 2b62dd5732 Resolving Issue #934
- Template names missing in graph management list
- Add nice new sort function for associative arrays
2018-02-21 19:28:35 -06:00
cigamit 6cc81c41aa Minor changes to lib/auth.php
Change documentation format and one inneficient $sql_hosts_where.
2018-01-06 14:12:42 -06:00
cigamit 62615311b5 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x
# Conflicts:
#	docs/CHANGELOG
2018-01-06 14:08:07 -06:00
Tony Roman 519b35f5cd Update copyright to 2018 2018-01-06 09:10:15 -05:00
netniV 498b498c6f Fix for Issue #1157 (#1160)
SQL Statements have now been corrected to prevent erroring during COUNT() and when using different auth method
2017-12-31 13:41:12 -06:00
netniV 2fe2b63e2d Fix for Issue #1157 (#1160)
SQL Statements have now been corrected to prevent erroring during COUNT() and when using different auth method
2017-12-30 08:42:36 -06:00
cigamit 698f8432a7 Resolving Issue #1157
Resolving issue with branch permission API
2017-12-29 10:31:47 -06:00
cigamit a56fc119e6 Resolving Issue #1157
Resolving issue with branch permission API
2017-12-29 09:08:16 -06:00
cigamit 2dcec10257 Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x
# Conflicts:
#	auth_login.php
#	lib/auth.php
2017-12-23 14:01:01 -06:00
cigamit 475b2f408d Minor format issues after merge of #1129 2017-12-23 13:50:56 -06:00
netniV 5ce4bea475 Fix issue #1122 - Local user login fails with Multi/Single LDAP enabled (#1129)
* Fix issue #1122 - Local user login fails with Multi/Single LDAP enabled

Code was not consistent with how it was generating the password hashes and comparing them. To fix this, added compat_password_xxx functions that check for the availability of the newer password_xxx functions and if not present revert back to the md5 version.

Changes made are:

auth_changepassword.php:
* Break out of switch when error message set
* Reduce duplication of code when checking passwords
* Use local variables rather than constantly pulling in request ones
* Use new compat_password_xxx functions

auth_login.php:
* Added some debug logging to identify login issues
* Allow local login even if using ldap
* Use new compat_password_xxx functions
* Remove password from SQL search as hash can change and we don't know what it would have been at the time it was set

user_admin.php
* Use new compat_password_xxx functions

lib\auth.php:
* Added compat_password_verify, compat_password_hash and compat_password_rehash to check for PHP 5.7+ compatible functions other use MD5
* Reduced SQL query to just required user in secpass_login_process()
* Fixed password check in secpass_check_history()
* Fixed return value check of secpass_check_pass() in secpass_login_process()
* Use new compat_password_xxx functions

* Update CHANGELOG

* Fixup for Issue #1122, corrects some minor issues

* Merge branch 'Issue-1122' of https://github.com/netniV/cacti into Issue-1122

Update log message to be warning notj ust a normal message

* Fix issue of local auth bypas

* Update CHANGELOG

Fix up CHANGELOG issues

* Update auth.php

Fix up formatting issues
2017-12-23 13:37:05 -06:00
netniV 979373fea4 Fix issue #1122 - Local user login fails with Multi/Single LDAP enabled (#1129)
* Fix issue #1122 - Local user login fails with Multi/Single LDAP enabled

Code was not consistent with how it was generating the password hashes and comparing them. To fix this, added compat_password_xxx functions that check for the availability of the newer password_xxx functions and if not present revert back to the md5 version.

Changes made are:

auth_changepassword.php:
* Break out of switch when error message set
* Reduce duplication of code when checking passwords
* Use local variables rather than constantly pulling in request ones
* Use new compat_password_xxx functions

auth_login.php:
* Added some debug logging to identify login issues
* Allow local login even if using ldap
* Use new compat_password_xxx functions
* Remove password from SQL search as hash can change and we don't know what it would have been at the time it was set

user_admin.php
* Use new compat_password_xxx functions

lib\auth.php:
* Added compat_password_verify, compat_password_hash and compat_password_rehash to check for PHP 5.7+ compatible functions other use MD5
* Reduced SQL query to just required user in secpass_login_process()
* Fixed password check in secpass_check_history()
* Fixed return value check of secpass_check_pass() in secpass_login_process()
* Use new compat_password_xxx functions

* Update CHANGELOG

* Fixup for Issue #1122, corrects some minor issues

* Merge branch 'Issue-1122' of https://github.com/netniV/cacti into Issue-1122

Update log message to be warning notj ust a normal message

* Fix issue of local auth bypas

* Update CHANGELOG

Fix up CHANGELOG issues

* Update auth.php

Fix up formatting issues
2017-12-23 12:58:03 -06:00
cigamit 7ed134070a Resolving Issue #1142
Add Site dropdown to the Graphs and Data Sources pages
2017-12-21 20:00:18 -06:00
cigamit 7226bb59de Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x
Update from develop
2017-12-03 09:08:35 -06:00
cigamit 139ec68a70 Be more consistent with feature 1.2 branch.
Note that this does not break functionality in 1.1.x.
2017-12-03 09:07:09 -06:00
cigamit 801d4e0b70 Resolve SQL/permission issues with get_allowed_graph_templates
This occurred due to the optimizations in pull request #1101.  The
$sql_user must, in it's entirety, be enclosed in parenthesis.
Otherwise, expand host functionality breaks.

I've also added the site_id in this commit to reduce the effort in
attempting to maintain both the feature branch and the develop branch.
It's not used, but returned.
2017-12-03 08:59:01 -06:00
cigamit 251a22ecff Merge remote-tracking branch 'refs/remotes/origin/develop' into feature/1.2.x
Updating feature 1.2 branch from Develop
2017-12-03 08:02:58 -06:00
cigamit 708be5b19f Cleanup after pull request #1177
Cleanup includes some misqueues in the pull request as well as some
other miscelaneous changes associated with how we have landed on
formatting.

Chagne include:
* No soft tabs on initial tabbing
* ON clause of JOIN should be capitalized and on separate line
* AND/OR should be capitalized in SQL Queries
* Formatting of db_..() functions calls
* Use of sizeof() instead of isset() for array checks
* i18n of Secpass check return values
* Remove trailing whitespace from lines

- ToDo: Remove more having in place of WHERE clauses
2017-12-02 10:26:34 -06:00
netniV 563e1ae09c Fixes for issues #1084, #1106 and #1116 (#1117)
* Fixes for issues 1106 (Graph filters), 1084 (Tree Branch population), and 1116 (Device Template won't set to none)

* Updated changelog\nfor issues #1084, #1106 and #1116
2017-12-02 10:57:08 -05:00
Patrick 50b358a194 Small rewrite/optimisation for auth query in issue #1091 (#1101) 2017-11-26 08:47:06 -06:00
cigamit 2c00d59b35 Resolving Issue #1097
Template user issues including:
- All template users should be disabled by default
- When a user is copied, enable that user by default
2017-11-23 12:30:56 -06:00
cigamit 99d19d5312 Correct whitespace and formatting issues
Whitespace and formatting in lib
2017-11-19 14:35:17 -06:00
Tony Roman 6d1b0a9a76 Merge branch 'develop' into feature/1.2.x
Conflicts:
	aggregate_graphs.php
	auth_login.php
	automation_templates.php
	cli/add_tree.php
	graph_templates_items.php
	lib/api_automation.php
	lib/api_tree.php
	lib/auth.php
	lib/html_form_template.php
2017-11-18 09:44:33 -05:00
Tony Roman 2eeabc2cc4 Move phpseclib to include/vendor directory 2017-11-18 09:31:27 -05:00
cigamit bea58d8fce Resolving Issue #958
User Group Tree permissions not resolved fully.
2017-11-04 20:19:07 -05:00
cigamit 223780bcec Resolving Issue #1012
Issue where disabled devices do not appear on the tree edit page.
2017-11-04 19:51:57 -05:00
cigamit 9cd66a045d Minor format changes for readablilty only. No functional changes 2017-10-28 15:04:09 -05:00
Tony Roman 6c73dd6105 Merge branch 'develop' into feature/1.2.x
Conflicts:
	cli/add_tree.php
	docs/CHANGELOG
2017-10-16 11:36:51 -04:00
Wolfgang Stöggl 4a1a15d72c Correct spelling of RRDtool (#1038)
- Change RRDTool -> RRDtool with a lowercase t.
- Replace in all files except *.mo, *.po, *.pot
2017-10-16 11:32:05 -04:00
cigamit 4680aa3a7e Correct remaining whitespace issues
Do a little cleanup of SQL queryies to use less horizontal space
2017-09-16 16:26:30 -05:00
Arno Streuli cedc671eaa Feature/1.2.x (#979)
* Update cacti.sql

Added 2 entry for cn_full_name and cn_email

* Update cacti.sql

Change the size to 50

* Create 1_2_0.php

Added the change on table user_domains_ldap, to provide info for full_name and email

* Update global_settings.php

Added the 2 new entry as new section for LDAP settings:
ldap_cn_fullname
ldap_cn_email

* Update auth.php

Added the email address on user_copy function

* Update ldap.php

Added the ldap_search_cn to search 2 specific CN on LDAP server

* Update auth_login.php

Added the Get user CN part for new LDAP users

* Update ldap.php

little error on ldap_search inside Getcn function

* Update user_domains.php

Add option to manage Full name and email taken from LDAP server

* Update auth_login.php

Change for multidomain authentication

* Update global_settings.php

change the name ldap_cn_xxx to just cn_xxx

* Update ldap.php

Correction to the error number and message when the CN is not find

* Update settings.php

Added the visibility of CN fields only for LDAP authentication mode

* Update ldap.php

correct on line 729 missing $ before this->cn

* Update cacti.sql

column definitions consistent with the definitions under install/upgrades/1_2_0.php

* Update auth_login.php

correct tab, as space, and add {} in if else statment

* Update ldap.php

correction on cacti_log with $output['error_text'], correction on all error_num 99 as '99'
and made some correction int tab/space

* Update auth_login.php

add missing {} on else function
2017-09-16 15:51:56 -05:00
cigamit 2c4b143c97 Resolving Issue #122
- Support Site Branch Type
- Note that though the branches currently render, their form and what is
rendered is still not finalized.
2017-09-01 14:19:11 -05:00
cigamit 7c46ee8de9 Resolving Issue #931
Aggregate graphs missing from list view
2017-08-27 08:48:21 -05:00
cigamit e08de31b34 Resolving Issue #904
Allow user to hide Graphs from disabled devices
2017-08-16 20:35:44 -05:00