Commit Graph
7374 Commits
Author SHA1 Message Date
netniV d89fc4c212 Installation now checks the URI path (#1152)
* Installation now checks that the URI path matches with configuration setting URL_PATH

* Update index.php

Fix up coding format
2017-12-23 12:58:49 -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 899eab02b5 Zoom context menu stays open after zoom out actions 2017-12-23 11:30:22 -06:00
cigamit 586212295a Resolving issues with the cacti_version_compare()
The cacti_version_compare() function was not operating properly when
moving between second order point versions (eg 1.1.29 to 1.2.0).  This
is resolved through a minor change to the cacti_version_compare()
function and the version_to_decimal() function.
2017-12-23 09:30:48 -06:00
cigamit 5c17ad8b67 Resolving Issue #1121
Bandwidth summation not using correct locale
2017-12-23 08:20:18 -06:00
netniV a20df3817c Fix for issue #1131 - upgrade_database.php (#1151)
Make upgrade_database.php use cacti_version_compare rather than version_compare (php version) to bring inline with /install/
2017-12-23 08:06:08 -06:00
netniV 5bd73b8318 Fix for issue #1130 (#1150)
Using cacti_log() with the optional POLLER_VERBOSITY_xxx paramater resulted in mising logs if they were set to the same level as the poller log level in settings
2017-12-23 08:03:27 -06:00
Tony Roman 98008449d0 Preping for 1.1.29 release 2017-12-22 15:06:58 -05:00
Tomasz Chiliński d0468112c0 CHILAN: allow to select many lines by interval determined by previously clicked line and lately clicked line with shift key pressed (continuation of work started in pull request #1132) (#1148) 2017-12-22 09:53:38 -06:00
Tomasz Chiliński e2b8e20047 CHILAN: allow to select many data queries by interval determined by previously clicked row and lately clicked row with shift key pressed (#1132) 2017-12-21 19:17:29 -06:00
cigamit 5e554e618a Resolving Issue #1143 2017-12-21 19:06:14 -06:00
netniV f2790006af Fix Issue #1133 - Incorrect variable name (#1134)
* Fix Issue #1133 - Incorrect variable name

Fixed the incorrect use of $totle in place of $title resulting in database insertion errors.

* Update import.php

Fix debug display to match code.

* Update CHANGELOG
2017-12-21 07:49:03 -06:00
cigamit 7b75366146 Correct backwards compatibility issues with Pull Request #1110
Total has to be after the end of all other existing indexes
2017-12-03 11:18:00 -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
Daniel Schall 7b4d33c880 Add CPU Total to 'SNMP - Get Processor Information' (#1110)
* Add CPU Total to 'SNMP - Get Processor Information'

This change adds a virtual index 'Total' to the SNMP info,
showing the average CPU utilization over all cores.

* Changing CPU Total in 'SNMP - Get Processor Information'

Making the total CPU utilization the first element in the array to avoid shifting when CPUs are added.

* Fix for issue #1111 - Issue with ldap authenication (#1118)

* Update change log for pull request #1111

* 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

* 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

* Fix issue #965 - LDAP search error results (#1112)

* Fix issue #965 - LDAP search erorr results

Corrected the error number returned by "Unable to set referrrals" to the correct number.

Added a new error for finding a users DN but not finding the user from the DN.

* Updated changelog for issue #965

* Fix issue 1106 - Graph Filters: template filter have empty value (#1114)

he filter uses index 0 as "All Graphs and Templates" but then searches graph_local for matches against graph_template_id. However, if index 0 is passed as a variable, it is also used in the search. Now when I looked at my database, the following entry existed:

select * from graph_local where graph_template_id = 0;
+------+-------------------+---------+---------------+---------------------+------------+
| id   | graph_template_id | host_id | snmp_query_id | snmp_query_graph_id | snmp_index |
+------+-------------------+---------+---------------+---------------------+------------+
| 1837 |                 0 |       0 |             0 |                   0 |            |
+------+-------------------+---------+---------------+---------------------+------------+

Therefore, it displays an index, but can't get a name for the template since there is no template with ID 0.

select * from graph_templates where id = 0;
Empty set (0.00 sec)

Added code to check for a zero value and only search the databsae if a value is present.

* Fix issue 1109 - Opening graph links by unlogged user - validation error (#1115)

* Fix issue 1109 - Opening graph links by unlogged user - validation error

Referer variable needs to be checked to ensure that it doesn't already have parameters applied.  If it does, then it needs to use the & rather than ? to join onto the URL.

* Updated changelog for issue #1109

* Fix spelling issue

* Minor updates to pull request 1109.

* Resolving Issue #1104

Different Timestamps in Cacti log when in Developer Debug

* Fix issue #1119 - ss_host_cpu.php pulling back too much data (#1120)

* As per the discussion on #1110 it would appear that ss_host_cpu is pulling back everything from the hrProcessorTable rather than just the processor usage. There appears to be a field named 'hrProcessorFrwID' being defined in the database which is actually the index field not the firmware ID

* Added CHANGELOG for issue #1119

* Fix for issue #1111 - Issue with ldap authenication (#1118)

* Update change log for pull request #1111

* 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

* 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

* Fix issue #965 - LDAP search error results (#1112)

* Fix issue #965 - LDAP search erorr results

Corrected the error number returned by "Unable to set referrrals" to the correct number.

Added a new error for finding a users DN but not finding the user from the DN.

* Updated changelog for issue #965

* Fix issue 1106 - Graph Filters: template filter have empty value (#1114)

he filter uses index 0 as "All Graphs and Templates" but then searches graph_local for matches against graph_template_id. However, if index 0 is passed as a variable, it is also used in the search. Now when I looked at my database, the following entry existed:

select * from graph_local where graph_template_id = 0;
+------+-------------------+---------+---------------+---------------------+------------+
| id   | graph_template_id | host_id | snmp_query_id | snmp_query_graph_id | snmp_index |
+------+-------------------+---------+---------------+---------------------+------------+
| 1837 |                 0 |       0 |             0 |                   0 |            |
+------+-------------------+---------+---------------+---------------------+------------+

Therefore, it displays an index, but can't get a name for the template since there is no template with ID 0.

select * from graph_templates where id = 0;
Empty set (0.00 sec)

Added code to check for a zero value and only search the databsae if a value is present.

* Fix issue 1109 - Opening graph links by unlogged user - validation error (#1115)

* Fix issue 1109 - Opening graph links by unlogged user - validation error

Referer variable needs to be checked to ensure that it doesn't already have parameters applied.  If it does, then it needs to use the & rather than ? to join onto the URL.

* Updated changelog for issue #1109

* Fix spelling issue

* Minor updates to pull request 1109.

* Resolving Issue #1104

Different Timestamps in Cacti log when in Developer Debug

* Fix issue #1119 - ss_host_cpu.php pulling back too much data (#1120)

* As per the discussion on #1110 it would appear that ss_host_cpu is pulling back everything from the hrProcessorTable rather than just the processor usage. There appears to be a field named 'hrProcessorFrwID' being defined in the database which is actually the index field not the firmware ID

* Added CHANGELOG for issue #1119

* Add CPU Total to 'SNMP - Get Processor Information'

This change adds a virtual index 'Total' to the SNMP info,
showing the average CPU utilization over all cores.

* Changing CPU Total in 'SNMP - Get Processor Information'

Making the total CPU utilization the first element in the array to avoid shifting when CPUs are added.

* Update CHANGELOG
2017-12-03 08:59:22 -05:00
netniV 4a98f50491 Fix issue #1119 - ss_host_cpu.php pulling back too much data (#1120)
* As per the discussion on #1110 it would appear that ss_host_cpu is pulling back everything from the hrProcessorTable rather than just the processor usage. There appears to be a field named 'hrProcessorFrwID' being defined in the database which is actually the index field not the firmware ID

* Added CHANGELOG for issue #1119
2017-12-02 12:43:15 -05:00
cigamit a47d713d7b Resolving Issue #1104
Different Timestamps in Cacti log when in Developer Debug
2017-12-02 11:16:14 -06:00
cigamit fddb513555 Minor updates to pull request 1109. 2017-12-02 10:39:09 -06:00
netniV a5cb7b4c87 Fix issue 1109 - Opening graph links by unlogged user - validation error (#1115)
* Fix issue 1109 - Opening graph links by unlogged user - validation error

Referer variable needs to be checked to ensure that it doesn't already have parameters applied.  If it does, then it needs to use the & rather than ? to join onto the URL.

* Updated changelog for issue #1109

* Fix spelling issue
2017-12-02 11:37:41 -05:00
netniV de304f9e84 Fix issue 1106 - Graph Filters: template filter have empty value (#1114)
he filter uses index 0 as "All Graphs and Templates" but then searches graph_local for matches against graph_template_id. However, if index 0 is passed as a variable, it is also used in the search. Now when I looked at my database, the following entry existed:

select * from graph_local where graph_template_id = 0;
+------+-------------------+---------+---------------+---------------------+------------+
| id   | graph_template_id | host_id | snmp_query_id | snmp_query_graph_id | snmp_index |
+------+-------------------+---------+---------------+---------------------+------------+
| 1837 |                 0 |       0 |             0 |                   0 |            |
+------+-------------------+---------+---------------+---------------------+------------+

Therefore, it displays an index, but can't get a name for the template since there is no template with ID 0.

select * from graph_templates where id = 0;
Empty set (0.00 sec)

Added code to check for a zero value and only search the databsae if a value is present.
2017-12-02 11:32:22 -05:00
netniV 1025bd4a7f Fix issue #965 - LDAP search error results (#1112)
* Fix issue #965 - LDAP search erorr results

Corrected the error number returned by "Unable to set referrrals" to the correct number.

Added a new error for finding a users DN but not finding the user from the DN.

* Updated changelog for issue #965
2017-12-02 11:30:58 -05: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
Tony Roman 3174c344d7 Update change log for pull request #1111 2017-11-30 20:32:57 -05:00
netniV 0701218d03 Fix for issue #1111 - Issue with ldap authenication (#1118) 2017-11-30 20:28:24 -05:00
Patrick 50b358a194 Small rewrite/optimisation for auth query in issue #1091 (#1101) 2017-11-26 08:47:06 -06:00
Tony Roman f3673b4686 New Graph pagenation and filter reset 2017-11-22 12:32:48 -05:00
Tony Roman 3f437bac3b Update change log for release 2017-11-19 08:19:05 -05:00
cigamit b1e412604e Resolving Issue #1074
Boost records get stuck in archive tables
2017-11-18 10:48:06 -06:00
cigamit 9a0baff5c8 Resolving Issue #1086
Rerun data queries in automation process has no effect
2017-11-18 10:35:23 -06:00
cigamit 17398b886d Be cognizant of other charsets when perfoming html_escape operations 2017-11-18 09:57:04 -06:00
cigamit 7a47e7d470 Correct minor WC3 Validation issue in graph preview filter 2017-11-18 09:55:31 -06:00
cigamit 889ea4c5fd Resolving Issue #1088
Remote Data collector polling has no timeout setting
2017-11-18 09:54:38 -06:00
cigamit 6cc3baa1d2 Poller output not empty not processed corretly on Log tab
Some minor formatting changes as well.
2017-11-18 07:18:46 -06:00
cigamit 59b4df33cc Resolving Issue #1087
add_device.php --proxy option does not work with non-snmp devices
2017-11-17 07:52:26 -06:00
cigamit 083c59cd74 Resolving Issue #1085
Call to undefined function html_log_input_error in debug mode
2017-11-17 07:43:18 -06:00
Browniebraun 6474d76f68 undefined index
- suppress lines breaks breaking graph output if error reporting level is high.
- avoid that remote pollers are requesting graphs from the main poller if the RRDproxy will be used as data storage. In this case remote pollers should directly talk to the proxy.
2017-11-17 11:08:43 +01:00
cigamit 7a5d171711 Resolving Issue #1079
- Undefined index in lib/snmpagent.php
- Remove trailing whitespace from file
- Reformat some sql statements.
2017-11-16 06:26:11 -06:00
DavidLiedke f6fce8ae59 Update to screenfull.js to 3.3.2 (#1081)
..from 3.3.1
2017-11-16 06:15:07 -06:00
DavidLiedke 8b7ba2f063 Update phpseclib to 2.0.7 (#1080) 2017-11-16 06:14:39 -06:00
netniV 786e9b7a34 Update links.php (#1082) 2017-11-16 06:13:25 -06:00
cigamit 96d793f33e Resolving Issue #1066
Made the dropdown logic consistent between clog and utilities as well.
2017-11-14 06:26:02 -06:00
Browniebraun 8a24be8f69 Update graph_json.php 2017-11-13 15:44:00 +01:00
Browniebraun 114f239245 usage of get_default_contextoption 2017-11-13 15:14:27 +01:00
Browniebraun ec4b6d3ff4 usage of get_default_contextoption 2017-11-13 15:12:20 +01:00
Browniebraun 4268b607b9 usage of get_default_contextoption 2017-11-13 15:11:00 +01:00
Browniebraun 6e7d2617ee usage of get_default_contextoption 2017-11-13 15:09:24 +01:00
Browniebraun b863dbc70e usage of get_default_contextoption 2017-11-13 15:03:00 +01:00
Tony Roman 4a0d2dc5fd Update Change log for release 1.1.28 2017-11-13 09:00:16 -05:00