Commit Graph
1372 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
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
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
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 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
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
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 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
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 8b7ba2f063 Update phpseclib to 2.0.7 (#1080) 2017-11-16 06:14:39 -06:00
Tony Roman 4a0d2dc5fd Update Change log for release 1.1.28 2017-11-13 09:00:16 -05:00
cigamit b3cd84782b Mark issue #1072 resolved
CVE-2017-16785 in global_session.php Reflection XSS issue
2017-11-12 11:04:00 -06:00
Patrick 928ae7de82 Various updates (#1075)
* Updated Dutch translations
- Fixed i18n

* Defined fields in queries

* Fixed changelog

* Updated Dutch translations

* Various fixes

All committed files:
- true|false to lowercase

add_perms.php:
- displayGroups() was undefined

add_tree.php:
- duplicate case for '--quiet'

repair_templates.php:
- correction function call to diaplay_version()

gettext.php:
- PHP EOF unneeded

* Fixed warnings in graph_view

* Updated Dutch translations
- Updated Dutch translations with latest cacti.pot file

* Updated Dutch translations
- Fixed conflicts in translations

* Various fixes
- Changed array access identifiers
- Fixed some code layout changes
- Fixed one i18n entry in api_automation.php

* Updated changelog

* Layout changes (tab instead of spaces)

* Layout changes (tab instead of spaces)

* Various fixes
- Changed array access identifiers
- Fixed some code layout changes

* Some fixes for better querying

* Layout change only

* Updated Dutch translations

* Updated changelog

* Updated changelog

* Fixed upgrade script 1_1_28.zip

* Few final fixes after CR or changes

* Updated Dutch translations

* fixed parameter typo in query_debug_timer_stop()

* fixed typo $_SESSION

* MibCache->install() uses MibParser->oids, but MibCache->oids has protected access instead of public

* Updated of PHPMailer to version 5.2.26
- Minor security backport from 6.0 - set Debugoutput in constructor according to SAPI in use, avoiding potential XSS in default debug output. Thanks to Bankde Eakasit for spotting it.

* Remove old autoLoad method
2017-11-12 09:39:55 -06:00
cigamit 79a06805a1 Minor performance increase in boost proces
Also reformat poller_boost.php to be consistent with other CLI
functions.
2017-11-12 08:46:57 -06:00
cigamit a179e8092d Resolving Issue #1066
Resolve second half of Issue #1066 which is CVE-2017-16661.
2017-11-11 07:39:13 -06:00
cigamit 4e74f46fe2 Resolving one half of Issue #1066 for CVE-2017-16660
- This issue will stop the injection point in the call
- Also adding a timeout to the polldata function to prevent long running
scripts from blocking the web server.
2017-11-11 06:16:40 -06:00
Patrick 4bc2f4c0bc Various updates (#1073)
* Updated Dutch translations
- Fixed i18n

* Defined fields in queries

* Fixed changelog

* Updated Dutch translations

* Various fixes

All committed files:
- true|false to lowercase

add_perms.php:
- displayGroups() was undefined

add_tree.php:
- duplicate case for '--quiet'

repair_templates.php:
- correction function call to diaplay_version()

gettext.php:
- PHP EOF unneeded

* Fixed warnings in graph_view

* Updated Dutch translations
- Updated Dutch translations with latest cacti.pot file

* Updated Dutch translations
- Fixed conflicts in translations

* Various fixes
- Changed array access identifiers
- Fixed some code layout changes
- Fixed one i18n entry in api_automation.php

* Updated changelog

* Layout changes (tab instead of spaces)

* Layout changes (tab instead of spaces)

* Various fixes
- Changed array access identifiers
- Fixed some code layout changes

* Some fixes for better querying

* Layout change only

* Updated Dutch translations

* Updated changelog

* Updated changelog

* Fixed upgrade script 1_1_28.zip

* Few final fixes after CR or changes

* Updated Dutch translations
2017-11-11 05:45:12 -06:00
cigamit 532684e7a9 Resolving Issue #1064
- When a Device Template is removed, Automation Templates for that
Device Template remain.
- Spurious introduction of html_escape()

Note that it does not make sense to remove the Automation Templates as
the user may intend to use them for some other purpose.
2017-11-10 18:07:17 -06:00
DavidLiedke f92879d5c5 Add CVE to Changelog for #1057 (#1067) 2017-11-08 08:35:12 +01: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 52a9e1fe8c Resolving Issue #1058
ICMP Ping to and IPv6 address fails to gather data for Ping Latency /
CentOS 7.4
2017-11-04 15:42:34 -05:00
cigamit fbbcedd378 Resolving Issue #1053
- Remote Data Collector issues with https and self signed certificates.
- Some spurious backport of html_escape() calls
2017-11-04 15:36:24 -05:00
cigamit e8088bb659 Resolving Issue #1057
- Potential vulnerability in RRDtool functions
- Adding validation to both dirpath and filepath, also verification of
executable status to files in RRDtool function.
- Spurious htmlspecialchars() to html_escape() calls
- Minor SQL formatting for readability
2017-11-04 14:52:09 -05:00
cigamit 295d390dc1 Resolving Isuse #1059
Aggregate item filter should use regular expressions to avoid SQL errors
due to flawed filter logic.
Backporting more html_escape() calls.
2017-11-04 14:01:21 -05:00
cigamit b7a4808d34 Resolving Issue #1055
Errors in data source statistics inserts when invalid output is
encountered.
2017-11-04 12:59:58 -05:00
cigamit 7ab455ad00 Resolving Issue #1044
Handle invalid exclusion regex properly when view the Cacti Log
2017-10-29 11:09:47 -05:00
cigamit 692c437e03 Resolving Issue #992
Resolving RRDfile naming issues that result from random sorting upon
export in prior versions of Cacti
2017-10-29 09:41:53 -05:00
cigamit 51932c6835 Resolving Issue #959
- Resolving issues viewing email reports due to email client decoder
issues.
- Also, make some format changes for readability of code
2017-10-29 09:27:16 -05:00
cigamit e961202f70 Resolving Issue #1048
Unable to import vdef's from templatesl
2017-10-27 06:52:44 -05:00
cigamit 7020f4ffbb Resolving Issue #1045
Issues with confirmation dialogs.
Also adding spurious html_escape() function over the use of
htmlspecialchars()
2017-10-26 21:52:53 -05:00
cigamit 7454361f2b Resolving Issue #1040
Resolving compatibility issue with PHP7.2
2017-10-18 11:28:14 -05:00