-
-
Notifications
You must be signed in to change notification settings - Fork 2.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix AD auth with large SID components #9207
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Per http://php.net/manual/en/function.unpack.php unpack on 32bit will convert large unsigned long values into signed long values, so we check for PHP_INT_SIZE and fix them up if necessary.
murrant
approved these changes
Sep 15, 2018
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested and works for me.
Evil2000
added a commit
to Evil2000/librenms
that referenced
this pull request
Sep 24, 2018
* Added information on assigning templates to alert rules I added some description how to attach templates to rules, because this was not very obvious to me. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Fixed Device->Eventlog to show rows/pages and Syslog hostname filter (librenms#9060) Fixed Device-> Eventlog to show number of rows per page and pagination. FIxed when you filter by Hostname in Overview->Syslog, the Hostname filter dissapear as is like you were in Device->Syslog. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Fix ldap fetching user_id as string (librenms#9067) * Display user id for auth_test.php -l (librenms#9066) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Added Basic Support for Allworx VoIP Systems (librenms#9057) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Fix port_id is null in ospf poller (librenms#9078) set it to 0 instead of null * Optimize OSPF poller (librenms#9080) if there are no instances, don't check for areas, neighbors, and ports DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Fixed xss in deluser (librenms#9079) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Isolate poller and discovery modules (librenms#9074) An exception in one module should not interrupt the process for other modules. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Fixed Debian Stretch rrdcached Base_Path (librenms#8966) * Fix Debian Stretch Base_Path * Update RRDCached.md * Added cli options debug and bill_id to poll-billing.php (librenms#9042) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Fixed IN db queries (librenms#9077) Most were fine as they hardcoded the in into the query. Change them all to use PDO properly. Did not fix IRCBot, they are are all hardcoded. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Added Basic Support for Arris D5 EdgeQAM (librenms#9083) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [X] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Fixed query for alert settings (librenms#9085) * convert NTP to JSON and json_app_get (librenms#9088) * add tests for v1 of the JSON NTP client stuff * update the NTP stuff to work with legacy and JSON * add the NTP client legacy tests * Update ntp-server.inc.php * Fixed alert notes (librenms#9093) Fix test-template.php to work like the actual alert code. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Prevent bgp-peers module from adding json data for every device (librenms#9091) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Improved hiveos-wireless OS Detection (librenms#9046) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [ ] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Added/Updated collectd information (librenms#9089) Added more information on how to setup collectd. Noted that the rrd location set in config.php needs to match /etc/collectd.conf and /etc/collectd.d/rrdtool.conf. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Fixed PeeringDB AS Selection table (librenms#9096) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` One note: As bgpLocalAs field in database is a varchar, ordering could be inconsistent with 4-byte asn as it will order using the first char. If you have 2 ASN (203524 and 32137) and your order by ASC (default) you will get: 203524 32137 * Update no-response.yml * Improved port polling in certain scenarios (librenms#9082) * Improved port polling in certain scenarios * Update ports.inc.php * Update ports.inc.php * Remove temporary variables * Create Installation-Ubuntu-1804-Nginx.md (librenms#8630) * Create Installation-Ubuntu-1804-Nginx.md A few tweaks are required to the Ubuntu 16.04 instructions to install on the newly released 18.04 version mostly relating to php being bumped to 7.2 from 7.0 and no mcrypt module for this php version in the distro repository. * Create Installation-Ubuntu-1804-Apache.md Used instructions from 1604 Apache as template and updated to work on Bionic (18.04). * Update Installation-Ubuntu-1804-Nginx.md Removed instructions for installing mcrypt module as I confirmed it works without it and it was mentioned it was no longer needed. * Update Installation-Ubuntu-1804-Apache.md The 1604 directions had a mixture of vi and vim for editing files. Since this is ubuntu and we want the instructions to be as easy as possible, I updated editor to be nano. I have no personal preference and can make it whatever we prefer, just figured it should be consistent between the two guides. * Update mkdocs.yml Added Ubuntu 18.04 instruction pages * Update Installation-Ubuntu-1804-Apache.md Corrected to libapache2-mod-php7.2 from libapache2-mod-php7.0 * Updated Ubuntu install docs * Added missing mbstring + curl packages * Additional parameters for list_alerts and list_devices API calls (librenms#9040) - Add filtering by severity in list_alerts. - Added ability to filter only active devices (not ignored and not disabled) in list_devices. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Fix invalid test data (librenms#9099) * Fix invalid test data and add test for it * fix bgp * add missing comma back * Add 18.04 install guide and and move 16.04 guide (librenms#9101) * Add 18.04 install guide and and move 16.04 guide Adds 18.04 install guides to "Installing LibreNMS" page. Moves 16.04 install guides to "Old install docs" section. * Update index.md Update index tree to 1804 over 1604 * Update devices.bgpLocalAs field from varchar to int (librenms#9098) * Update devices.bgpLocalAs field from varchar to int * Fixed reorder * Fix to requested changes * Fix reorder again * Fix comware snmprec order (librenms#9103) * Test fixes (librenms#9105) * Fix BENU MIB timestamp * Fix comware bgp order * fix ntp json data * Fix occamos json * Add fanspeed for EdgeSwitch (librenms#9013) * Add fanspeed for EdgeSwitch * Added test files * Move existing EdgeSwitch discovery to yaml * Updated json test data * remove bgp test data * feature: Added dynamic graphs with RrdGraphJS by oetiker (librenms#9087) * feature: Added dynamic graphs with RrdGraphJS by oetiker (https://github.com/oetiker/RrdGraphJS) * fixed DragCursor.cur * refactoring, only js when needed * doc: added use of dynamic graphs switch in Configuration.md * Updated to use Config, schema + example gif * Rename 261.sql to 262.sql * SNMP v3 auth is no longer checked for case sensitivity + push pass v3 creds to front of queue (librenms#9102) * Match api code to addhost.php for v3 config order * Updated v3 auth checks for case insensitivity + docs * Small fix to not throw error if details is already empty (librenms#9086) * Converted PagerDuty to new transport format (librenms#9092) * Converted PagerDuty to new transport format * Attempt at oauth for transports * clean * missing images * reverted wrong file. phpstorm saved me... * fix typo * Updated to help the display * Fix validation error, start to try to send alerts. Editing the transport, deletes the service_key... * Ignore hidden config options * Fix up api call, proper feedback. * hide oauth field in print list * Relax mysql check (librenms#9100) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Fixed install suggesting to install mysqli -> mysqlnd (librenms#9108) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Set ip to null when a device is renamed (librenms#9112) Oddly this doesn't check if the target hostname exists in the database, so that is left to the caller. (likely the target rrd directory will exist). If we wanted to check that in function this I'd probably covert it to Exception errors so we could signal the different types of failures. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Add robots.txt to the docs site. (librenms#9110) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Fixed url to graphs from date selector (librenms#9109) * Fixed slack options not showing in the webui (librenms#9107) * Fixed slack options not showing in the webui * Update config extraction too * Changelog for 1.43 (librenms#9116) * Additional debug output when sending/testing email (librenms#9120) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Update to add breaking-change label + fix users list formatting (librenms#9121) * Email debug (librenms#9123) * print email debug info when sending * Actually list the emails, not the names * Fixed web installer to allow users to change db creds if we can't connect (librenms#9126) * Fixed varchar comparision when using numeric and text sensor_index (librenms#9114) * Fixed edgeswitch temperatures (librenms#9130) There was a typo in the definition https://community.librenms.org/t/ubuiquiti-ubnt-switches-not-showing-temperatures/5243 DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Remove js symlinks and extra files (librenms#9134) All symlinks are removed except: ./html/api_v0.php -> index.php ./html/pages/device/neighbours/list.inc.php -> ../ports/neighbours.inc.php Allows things to mostly work on Windows Linux subsystem when LibreNMS resides on the ntfs partition. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Don't update ospf stats if there are none. (librenms#9133) Also fixes fatal error ->count() on null. * Enable and catch exceptions for PHPMailer to gather error messages. (librenms#9132) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Fixed Total Chassis Power sensor_index for SmartAX MA5603T/MA5683T (librenms#9115) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [X] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` In SmartAX MA5683T/MA5603T Starting index for Per Card power starts in '0' instead '1'. '0' was also the index for Total Chassis Power. * Improve error handling (librenms#9111) Handle exceptions more correctly. Before we could bypass some important logic if APP_DEBUG was set to false. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Added support for EdgeCore ES3510MA (librenms#9081) * device: Added support for EdgeCore ES3510MA * Update edgecos.yaml * Create edgecos_es3510ma.snmprec * Create edgecos_es3510ma.json * Fix edgeswitch numeric oids (librenms#9138) * Disable test devices to block normal poller (librenms#9131) Still could happen, but much less likely. * Do not try to fetch data again if previous attempts failed (librenms#9139) result is null, which will fail isset() check * Fixed print date selector (librenms#9142) * Syntax error in documentation (librenms#9145) just found a little syntax error in the docs, nothing special :) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 9145` * Modified timestamp sent to nagios transport in order to fix an issue with flapjack …ith flapjack DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Remove duplicate mib directories from snmp queries (librenms#9148) General cleanup of that function DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * fix testing snmp timeouts and junos mib error (librenms#9147) convert the junos call to translate too. Not 100% sure what was wrong with arris-c4, but removing this data fixed it and tests still pass. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Added Comware Power Usage (librenms#9016) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [X] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Added support for Rancid git (librenms#9036) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [X] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` This pull req adds support for Rancid GIT backend (instead of the current supported SVN). Not only git is preferred these days, also php-svn is non-existing on php 7+, so the only Rancid option is broken on PHP 7+, so might be nice to have this included :) * Add OpenBSD Carp State Sensor (librenms#9143) * Add OpenBSD Carp State Sensor * Added json test data * WebUI: Oxidized Device List: Link to config and refreshDevice Btn (librenms#9129) * WebUI: Direct link to oxidized config from list, oxidized refresh device capability * WebUI: Direct link to oxidized config from list, oxidized refresh device capability * Move oxidized_node_update in functions.php to avoid code duplication * Update refresh-oxidized-node.inc.php * Update functions.php * Added FAQ on where to update database credentials if they change (librenms#9127) * Update Rules.md (librenms#9156) * Database schema cleanup (librenms#9064) * target db_schema * Database schema cleanup Remove several inconsistencies (mostly with data types and lengths) Make things a bit nicer to implement with Laravel database migrations. poller* tables had f'd up indexes * Update tests, extra noise because db returns numeric types now. * Update test data again. * fix 253 migration for mysql 5.3 * Fixed PeeringDB module (librenms#9158) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [X] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` Fixed "Show connected IXes" that I broke in my past PR (Sorry for that) Changed remote_as in pdb_ix_peers from varchar to unsigned int for correct ordering. Also I've corrected a typo in the "Show connected IXes" button * Fix a couple of validation items (librenms#9154) - Ignore .pki/nssdb. This happens when /opt/librenms is set as the home directory of the librenms users, personally, I would suggest adding cd /opt/librenms in ./bashrc (or equivalent) instead. - fix validate when db connection fails. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * change Indexs -> Indexes (librenms#9161) I think Indexes is the proper word. What flow-on affects will this have? * Improve updating note about cron * Add note to cron file advising not to disable daily.sh (librenms#9164) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [ ] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Squelch PBN processor warnings (librenms#9153) Don't use NMS-PROCESS-MIB for pbn processors. This keeps tests from spitting out warnings about the broken mib. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Added HPE iLO Version Polling (librenms#9146) * Add HPE iLO Version Polling * Added json test data * Fix style * Fixed latency over 1s causes db update to fail (librenms#9157) * fix latency over 1s causes db update to fail * Moved schema file 264-265.sql * Fixed template to alert mapping (librenms#9173) * Sanitize data in dashboard add/edit/delete (librenms#9171) * sanitize data in dashboard add/edit/delete * handle access differently * Fixed edit processors/storage/memory search query (librenms#9172) * Fixed edit processors search query * Fixed 2 more search queries * WebGUI Oxidized - Add author+message + refresh button (librenms#9163) * WebGUI Oxidized - Add author+message + refresh button * WebGUI Oxidized - Add author+message + refresh button * WebGUI oxidized - move refresh_oxidized_node to js/librenms.js * WebGUI oxidized - Style upgrade for refresh button * WebGUI oxidized - move refresh_oxidized_node to js/librenms.js * Update showconfig.inc.php * Fix Travis (librenms#9176) Output something for phpunit tests, if they take over 10 mins, it will fail the test. * fix: edgeswitch fans (librenms#9162) * fix fan state fix fan duty instead of rpm * changed check to os definition bad_fanspeed * revert back fan rpm * Fix other state generics * Update fanspeed.inc.php * Update edgeswitch.json * snmpsim tests data * Update tests * fix edgecos issue (librenms#9150) * device: Initial support for CXR-Networks Terminal Server (librenms#9169) * device: Initial support for CXR-Networks Terminal Server * device: Support for CXR-Networks Terminal Server - CodeClimate + cleaning * device: renamed cxr-networks-ts and code improvement * device: cxr-networks-ts test data * device: renamed os as cxr-ts * device: renamed os as cxr-ts, test data * ignore dns errors when fetching astext * Added BGP Peer Descriptions (librenms#9165) * Added BGP Peer Descriptions * Fixed formatting * Added to device routing tab too * Some text formatting * Test files * Added default null to bgpPeerDescr * Added db_schema.yaml * Fix default value for bgpPeerDescr * Fixed Order and Search box * Added glyphicon for success/error * Switch to toastr notification * Removed unused bootstrap code * Feature: Collect VRP Entity details in the Huawei MIB (librenms#8888) * Feature: Collect VRP Entity details in the Huawei MIB * Feature: Collect VRP Entity details in the Huawei MIB - Add Test Data * Renaming of the test file vrp_5720_vrf.snmprec * Added json test files * Update vrp_5720_vrf.snmprec * Update vrp_5720_vrf.snmprec * Update vrp_5720_vrf.json * Updated processor and mempool discovery to limit descr field * Updated test * Updated tests again * Updated json test data * Update vrp_ce12804-entity.json * Update vrp_ce12804-entity.json * Update vrp_5720_vrf.json * Use Laravel authentication (librenms#8702) * Use Laravel for authentication Support legacy auth methods Always create DB entry for users (segregate by auth method) Port api auth to Laravel restrict poller errors to devices the user has access to Run checks on every page load. But set a 5 minute (configurable) timer. Only run some checks if the user is an admin Move toastr down a few pixels so it isn't as annoying. Fix menu not loaded on laravel pages when twofactor is enabled for the system, but disabled for the user. Add two missing menu entries in the laravel menu Rewrite 2FA code Simplify some and verify code before applying Get http-auth working Handle legacy $_SESSION differently. Allows Auth::once(), etc to work. * Fix tests and mysqli extension check * remove duplicate Toastr messages * Fix new items * Rename 266.sql to 267.sql * Don't allow underscores in variant names (librenms#9182) * Don't allow underscores in variant names * forgot test files * Update test data * Fix extra large login images (librenms#9183) * Correct typo (librenms#9184) - boolean on weather to call rndc stats + boolean on whether or not to call rndc stats * Fix API auth issues (librenms#9185) * Fix API auth issues Api access page now creates tokens with the correct ID. Correctly creates users for legacy user tokens. Fix Ldap comparison Laravel Util class to make code easier to access/read * More api access page fixes * fix style * Fixed routing edit to use LegacyAuth (librenms#9188) * Init and refresh the php session each page load (librenms#9186) * use UTC if date.timezone is not set (librenms#9181) * Fix auth user level not updated (librenms#9190) * Fix auth user level not updated * Update all fields * Fix error in logout (librenms#9189) session_destroy(): Trying to destroy uninitialized session * Fix up ldap-authorizer, create non-existent users (librenms#9192) * First attempt at ldap-auth fixes * no, guest, so it is not allowed. * cast to int * don't count on Session * return full user * Specific error for guest not allowed. * fix up external auth user creation * fix check * Fix user level missing Simplify middleware * use guard if configured * Fix anonymous bind (librenms#9195) With the retriveByLegacyId() split out this should just be a simple get from the db. * Allow uppercased interface name used in Cisco SG350X models (librenms#9178) * Update Test-Units.md * Allow trusted proxy via APP_TRUSTED_PROXIES (librenms#9196) * Allow trusted proxy via APP_TRUSTED_PROXIES Set to '*' by default to emulate legacy behavior. Set up doc describing environment variables * Create helper to parse environment variables into arrays properly. * Update doc blocks * Fix devices unpolled check * Work around for annoying Components errors. * use is_array() to guard against more garbage. * Import DB * Fix for real... * Only run unit tests on 7.2 (librenms#9201) * Only run unit tests on 7.2 Move style check to 7.1 * stop build when a script fails * More codeclimate tuning (librenms#9197) * Updated example for new alerting engine (librenms#9193) * Updated example for new alerting engine Using the example of port utilization caused errors when trying to use it with the new alert system. Putting variables in curly braces and removing php calls resolved it. Updating docs to reflect this. Also removed examples with hash tags in the body of the template as pasting this in will cause syntax errors by the alerts script. * Update Templates.md * WebUI: Use generate_url for Oxidized List device (librenms#9200) * Add line break (librenms#9205) * Fixed format for snmpd configuration step (librenms#9203) * VRP: improving extraction of HW and Version (librenms#9167) * VRP: improving extraction of HW and Version * VRP: Improving extraction of HW and Version - CodeClimate update * VRP: Improving extraction of HW and Version - Review and debug code cleaning * VRP: Improving extraction of HW and Version - resolve OIDs and swap order of poll * VRP: Improving extraction of HW and Version - resolve OIDs and swap order of poll * Device: VRP: Update test data * Device: VRP: Travis code clean * Device: VRP: Update test data for variants * Device: VRP: Update test data for variants * change : with . (librenms#9206) * Switch IRC to Discord link in database validation (librenms#9209) * Don't output non-fatal errors from legacy web pages. (librenms#9208) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Fix AD auth with large SID components (librenms#9207) * Fix AD auth with large SID components Per http://php.net/manual/en/function.unpack.php unpack on 32bit will convert large unsigned long values into signed long values, so we check for PHP_INT_SIZE and fix them up if necessary. * Fix indentation * Remove api rate limits (librenms#9211) * Show sensors warnings values + moved to json and toastr (librenms#9210) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` * Update github templates * verbage * Speed up testing based on changed files (librenms#9214) * Speed up testing based on changed files * Updated to use phpunit instead of foreach loop * AD Authorization fixes (librenms#9216) * AD Authorization fixes Remove mres() and $_SESSION usage. Remove broken addUser function and use Mysql addUser. * AD Authorization fixes Remove mres() and $_SESSION usage. Remove broken addUser function and use Mysql addUser. Extract common AD auth code to ADUtils * AD Authorization fixes Remove mres() and $_SESSION usage. Remove broken addUser function and use Mysql addUser. Extract common AD auth code to ADUtils * Send no user info to log instead of toast. * Remove commented code * add abstract getConnection() method that is required. * Actually return the value * Update Syslog.md (librenms#9220) Added configuration for Allied Telesis Alliedware Plus. Note: This should be accepted after librenms#9219 has been delivered. * device: Add Allied Telesis oxidized syslog hook support (librenms#9219) This patch adds support for Allied Telesis AW+ devices running at least 5.4.8-2.1 the ability to automatically have oxidized pull configs when the device config has been saved. Syslog hook for LibreNMS config.php $config['os']['awplus']['syslog_hook'][] = Array ('regex' => '/IMI.+.Startup-config saved on/', 'script' => '/opt/librenms/scripts/syslog-notify-oxidized.php'); Note: V5.4.8-2.1 should be released on roughly Nov 2 2018. Refer to the following for latest release notes: https://www.alliedtelesis.com/documents/release-notes-alliedware-plus-548 * More specific test filtering (librenms#9226) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` After you are done testing, you can remove the changes with `./scripts/github-remove`. If there are schema changes, you can ask on discord how to revert. * Fixed install.php not redirecting when it should (librenms#9224) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` After you are done testing, you can remove the changes with `./scripts/github-remove`. If there are schema changes, you can ask on discord how to revert. * Updated file permissions check for validate (librenms#9218) Always post generic full fix commands. Use chmod instead of setfacl in case the filesystem doesn't support acls. DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` After you are done testing, you can remove the changes with `./scripts/github-remove`. If there are schema changes, you can ask on discord how to revert. * Fixed PagerDuty alert to show rule name + device as summary (librenms#9213) * Fixed PagerDuty alert to show rule name + device as summary * Update Pagerduty.php * Added ability to set a custom SQL query for alert rules. (librenms#9094) * Added support for AVG in rules * More updates * Final work to have advanced sql queries * Added missing use * Fix exception when invalid json is passed * Fixed api for alert rules * updated docs * Fixing Sentry 3 and 4 Temperature Sensors (librenms#9177) * fixing sentry3 temperature sensor issues: read all sensors not just first two, fix reading limit and current values, fixing snmp get options * fixing sentry4 temperature sensor issues: read all sensors not just first two, fix reading limit and current values, fixing snmp get options * fixing code style issues * addressing review items from murrant, removing individual snmp_gets, fixing fahrenheit to celcius code back * addressing review items, putting back the celcius fahrenheit conversion logic back * using snmpwalk_cache_oid instead of reinventing in sentry3 code * using pre-cache for sentry4 temp sensors, addressing review items * checking all sentry3 humidity sensors instead of first two, bulk reading instead of individual gets * addressing style issues * pre-caching sentry4 humidity warning table removing duplicate temp sensor event config table * adding two more sentry snmprec files after temperature and humidity sensor updates * making sensor index values for sentry3/4 unique * adding sentry3 and 4 test data files after temperature and humidity sensors update * VRP: Discovery improvement for optical power + Mib upgrade (librenms#9225) * Huawei Mib file update * VRP: Improve sensor discovery for optical equipment * VRP: Improve sensor discovery for optical equipment * VRP: Adding Test data after sensor dbm update * add-apt-repository universe (librenms#9237) adjustment to ## Install Required Packages ## section > add-apt-repository universe * Add universe repo (librenms#9238) adjustment to ## Install Required Packages ## section > add-apt-repository universe * Added Transit+Peering to Port Aggregator in the graph widget (librenms#9234) * Fixed remember me for login (librenms#9233) remember me and AuthenticateSession are incompatible on Laravel 5.4 laravel/framework@6ca154f More info: https://kfirba.me/blog/the-undocumented-authenticatesession-middleware-decoded DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` After you are done testing, you can remove the changes with `./scripts/github-remove`. If there are schema changes, you can ask on discord how to revert. * Run all tests in os group when testing specific OS (librenms#9235) https://phpunit.de/manual/6.5/en/textui.html#textui.examples.filter-patterns DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` After you are done testing, you can remove the changes with `./scripts/github-remove`. If there are schema changes, you can ask on discord how to revert. * Added specific support for APC Automatic Transfer Switch (librenms#9221) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` After you are done testing, you can remove the changes with `./scripts/github-remove`. If there are schema changes, you can ask on discord how to revert. ---------------------------- **APC Automatic Transfer Switch are now detected has generic APC device like a PDU, but the overall information is not the same.** Long time that I've not added a new device, sorry in advance for the mistakes... ![screen shot 2018-09-18 at 10 02 55](https://user-images.githubusercontent.com/1927109/45676643-7fb30e00-bb32-11e8-82e2-bd08f27b9757.png) <img width="912" alt="screen shot 2018-09-18 at 10 38 10" src="https://user-images.githubusercontent.com/1927109/45676644-7fb30e00-bb32-11e8-84e9-bab33ccce72a.png"> <img width="899" alt="screen shot 2018-09-18 at 10 40 07" src="https://user-images.githubusercontent.com/1927109/45676645-7fb30e00-bb32-11e8-867e-caa5d731981a.png"> * Fixed FAQ link and added delayed alerts FAQ (librenms#9239) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [ ] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` After you are done testing, you can remove the changes with `./scripts/github-remove`. If there are schema changes, you can ask on discord how to revert. * Added support for allowing alerts to un-ack (librenms#9136) * Add support for allowing alerts to un-ack * Updated db_schema.yaml * Update and rename 263.sql to 265.sql * Fix up ui a bit. * Renamed sql file * Disable used rules in template map for select them (librenms#9212) * Disable used rules in template map for select them * WIP Enable/Disable options dynamically * Enable/Disable options dynamically * Even better. Selected options for template are not disabled * Didnt work so reverting back * Update attach_alert_template.inc.php * Move ext-mysqlnd to suggested for now (even though it is actually required) (librenms#9229) * Move ext-mysqlnd to suggested for now (even though it is actually required) Remove extra dependency version locks, they are more trouble than they are worth. I just run composer with php 5.6 when updating composer.lock. Update dependencies. * Trigger full build on composer updates * Update composer.json * Update new_alert_rule.inc.php (librenms#9240) * Fixed edit dashboard permissions + moved to toastr (librenms#9236) * Fixed edit dashboard permissions + moved to toastr * Moved $_POST to $vars * Update syslog display and backend (librenms#9228) * Update syslog display backend select boxes now dynamically load instead of loading all on pageload select and table ajax backends completely redone with Laravel (just syslog for now) duplicate url creation to Url utility class for now (uses Device model instead of array) build short hostname functionality into Device->displayName() helper * Fix whitespace * Some tidying up. Split out displayName() and shortDisplayName() * Enable auto-sizing. Fix small error in Url * Eager load device Use bootstrap theme for select2 * Updated EXIM Download instruction (librenms#9241) Changed EXIM status download instructions to match other extensions * Syslog fixes (librenms#9246) * Fix syslog select2 theme (librenms#9248) Wrong one :/ htmlentities the rest... * Config class collides with Config in model namespace * Docs for listing devices in a device group seems misplaced in port-docs. (librenms#9250) DO NOT DELETE THIS TEXT #### Please note > Please read this information carefully. You can run `./scripts/pre-commit.php` to check your code before submitting. - [x] Have you followed our [code guidelines?](http://docs.librenms.org/Developing/Code-Guidelines/) #### Testers If you would like to test this pull request then please run: `./scripts/github-apply <pr_id>`, i.e `./scripts/github-apply 5926` After you are done testing, you can remove the changes with `./scripts/github-remove`. If there are schema changes, you can ask on discord how to revert. * Re-enable unit tests for PHP 5.6 (librenms#9251) * Improved ASUSWRT-Merlin (librenms#9253) higher resolution icon for ASUSWRT-Merlin * List files for new permission check. (librenms#9255) * Update Eventlog WebUI/backend to use ajax (librenms#9252) * WIP Eventlog table * Initial Eventlog rework * fromdevice is not a request parameter * updates * remove unneeded field * Cleanups
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Per http://php.net/manual/en/function.unpack.php unpack on 32bit will convert large unsigned long values into signed long values, so we check for PHP_INT_SIZE and fix them up if necessary.
DO NOT DELETE THIS TEXT
Please note
Testers
If you would like to test this pull request then please run:
./scripts/github-apply <pr_id>
, i.e./scripts/github-apply 5926