Commit Graph
2797 Commits
Author SHA1 Message Date
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 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 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
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
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 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 a47d713d7b Resolving Issue #1104
Different Timestamps in Cacti log when in Developer Debug
2017-12-02 11:16:14 -06: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
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
cigamit b1e412604e Resolving Issue #1074
Boost records get stuck in archive tables
2017-11-18 10:48:06 -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 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
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 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 ecd34627e6 new function get_default_contextoption added
define a new function to consolidate the different setup options of default (file) streams. introduce a new hook to ensure that custom plugins are able to add their own header flags for authentication cookies and so on.
2017-11-13 14:58:53 +01:00
cigamit c0f0ce27f0 Resolving Issue #1066
CVE fixes using wrong if() logic.
2017-11-13 07:56:33 -06:00
cigamit f3e15019bb Resolving Issue #1033
Another Update to cover guages and absolute
2017-11-13 06:56:38 -06:00
cigamit 0636bb5987 Minor format changes 2017-11-12 09:41:38 -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
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 bea58d8fce Resolving Issue #958
User Group Tree permissions not resolved fully.
2017-11-04 20:19:07 -05:00
cigamit 373911e429 Additional export updates for backward compatibility
Additional optimizations for export routing to support consistent file
namings
2017-11-04 20:07:56 -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 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 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 e21919937f Another approach to Issue #1039
Correction to XSS issue page refresh.  This approach makes a small
alteration to the existing sanitize_uri() function to sanifize the url.
2017-10-28 15:25:30 -05:00
cigamit 9cd66a045d Minor format changes for readablilty only. No functional changes 2017-10-28 15:04:09 -05:00
cigamit e961202f70 Resolving Issue #1048
Unable to import vdef's from templatesl
2017-10-27 06:52:44 -05:00
cigamit 7454361f2b Resolving Issue #1040
Resolving compatibility issue with PHP7.2
2017-10-18 11:28:14 -05: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 0c76706145 Resolving Issue #1033
Insert issues into dsstats table.
2017-10-16 06:28:45 -05:00
cigamit 86f719b923 Resolving Issue #989
- Spaces lost on re-import of data input method.
- Possible injection point in templates_export.php
- Minor format changes to db calls

Note that this will not 100% resolve the importation of old templates.
However, all new templates will base64_encode all input strings prior to
XML encoding, which resolves this issue ongoing.
2017-10-15 09:54:07 -05:00
Patrick c3419aa36e Various fixes && Updated Translations (#1032)
Good catch on the bug fixes too.  Hard to spot.
_______________________________________________________

* 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

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

* Updated Dutch translations
- Fixed conflicts in translations
2017-10-15 07:27:25 -05:00
cigamit 9a9eb3c941 Resolving Issue #1003
Redirecting standard output and error to the console causes poller
slowdowns.
2017-10-11 18:11:37 -05:00
Patrick 4617c60a02 Various updates (#1016)
* Updated Dutch translations
- 1007 translations remaining (70% translated)
- Typo fixes

* Fix for #1005

* Schema changes
- Examined queries without key usage and added/changed some keys

* Fixed some missing i18n
2017-10-07 13:05:12 -04:00