From fbade7315108b5beb6740263dc5e07e12fb5d897 Mon Sep 17 00:00:00 2001 From: malle-pietje Date: Tue, 14 Apr 2020 15:21:08 +0200 Subject: [PATCH] UniFi API browser 2.0.9 - executed composer update to update packages - upgraded PHP API client to version 1.1.52 - minor changes - added max. tx/rx-rates attributes to fetch for the gateway stats --- README.md | 10 +- ajax/fetch_about_modal_metrics.php | 2 +- ajax/fetch_collection.php | 6 +- ajax/fetch_sites.php | 2 +- ajax/show_api_debug.php | 2 +- ajax/update_controller.php | 2 +- ajax/update_theme.php | 2 +- collections.php | 2 +- common.php | 2 +- composer.lock | 36 +- config/config-template.php | 2 +- config/users-template.php | 2 +- js/custom.js | 4 +- templates/components/about_modal.html.twig | 2 +- vendor/art-of-wifi/unifi-api-client/README.md | 27 +- .../unifi-api-client/examples/block_list.php | 2 +- .../unifi-api-client/src/Client.php | 356 +++++++++++------- vendor/composer/installed.json | 42 +-- vendor/symfony/polyfill-ctype/composer.json | 2 +- vendor/twig/twig/CHANGELOG | 4 + vendor/twig/twig/LICENSE | 4 +- vendor/twig/twig/composer.json | 4 +- vendor/twig/twig/doc/advanced.rst | 7 +- vendor/twig/twig/doc/advanced_legacy.rst | 5 - vendor/twig/twig/doc/api.rst | 15 +- vendor/twig/twig/doc/filters/filter.rst | 2 +- vendor/twig/twig/doc/filters/reduce.rst | 2 +- vendor/twig/twig/doc/functions/block.rst | 4 +- vendor/twig/twig/doc/functions/constant.rst | 4 +- vendor/twig/twig/doc/templates.rst | 8 +- vendor/twig/twig/doc/tests/constant.rst | 2 +- vendor/twig/twig/doc/tests/sameas.rst | 2 +- vendor/twig/twig/drupal_test.sh | 3 +- vendor/twig/twig/ext/twig/php_twig.h | 2 +- vendor/twig/twig/src/Environment.php | 6 +- vendor/twig/twig/src/ExpressionParser.php | 2 +- .../twig/twig/src/Extension/CoreExtension.php | 2 +- vendor/twig/twig/src/Parser.php | 4 +- .../twig/twig/src/Sandbox/SecurityPolicy.php | 4 +- vendor/twig/twig/src/Template.php | 6 +- 40 files changed, 327 insertions(+), 270 deletions(-) diff --git a/README.md b/README.md index 7634639..c88d2b1 100755 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ You will find examples and detailed instructions there. Please keep the following in mind: - the API browser tool doesn't support all available data collections/API endpoints, see the list below of those that are currently supported -- currently, versions 4.x.x and 5.x.x of the UniFi Controller software are supported (version 5.12.35 has been confirmed to work) as well as UniFi OS-based controllers (version 5.12.59 has been confirmed to work) -- when accessing UniFi OS-based controllers (e.g. UDM PRO) through this tool, please read the remarks below regarding UniFi OS support +- currently, versions 4.x.x and 5.x.x of the UniFi Controller software are supported (version 5.12.66 has been confirmed to work) as well as UbiOS-based controllers (version 5.12.59 has been confirmed to work) +- when accessing UbiOS-based controllers (e.g. UDM PRO) through this tool, please read the remarks below regarding UbiOS support - there is still work to be done to add/improve functionality and usability of this tool so suggestions/comments are welcome. Please use the GitHub [issue](https://github.com/Art-of-WiFi/UniFi-API-browser/issues) list or the Ubiquiti Community forums (https://community.ubnt.com/t5/UniFi-Wireless/UniFi-API-browser-tool-released/m-p/1392651) to share your ideas/questions. - please read the Security Notice below before installing this tool! @@ -130,9 +130,9 @@ Alternatively you may choose to download the zip file and unzip it in your direc - after following these steps, you can open the tool in your browser (assuming you installed it in the root folder of your web server as suggested above) by going to this url: `http(s):///UniFi-API-browser/` -### UniFi OS support +### UbiOS support -Support for UniFi OS-based controllers (UniFi Dream Machine Pro) has been added with version 2.0.7. When adding the details for a UniFi OS device to the `config/config.php` file, please make sure not to add a port suffix or trailing slashes to the URL. +Support for UbiOS-based controllers (UniFi Dream Machine Pro) has been added with version 2.0.7. When adding the details for a UbiOS device to the `config/config.php` file, please make sure not to add a port suffix or trailing slashes to the URL. ### Extending the dropdown menu @@ -148,7 +148,7 @@ $collections = array_merge($collections, [ 'options' => [ [ 'type' => 'collection', // either collection or divider - 'label' => 'hourly site stats past 24 hours', // string that is dosplayed in the dropdown menu + 'label' => 'hourly site stats past 24 hours', // string that is displayed in the dropdown menu 'method' => 'stat_hourly_site', // the method/function in the API client class that is called 'params' => [(time() - (24 * 60 *60)) * 1000, time() * 1000], // an array containing the parameters that are passed to the method/function 'key' => 'custom_0' // unique key for this menu option, may be required for future versions diff --git a/ajax/fetch_about_modal_metrics.php b/ajax/fetch_about_modal_metrics.php index c1e9815..c51e490 100755 --- a/ajax/fetch_about_modal_metrics.php +++ b/ajax/fetch_about_modal_metrics.php @@ -54,4 +54,4 @@ * output the results with correct JSON formatting */ header('Content-Type: application/json; charset=utf-8'); -echo (json_encode($results)); +echo (json_encode($results)); \ No newline at end of file diff --git a/ajax/fetch_collection.php b/ajax/fetch_collection.php index 1da0a5e..d343bec 100755 --- a/ajax/fetch_collection.php +++ b/ajax/fetch_collection.php @@ -49,6 +49,8 @@ 'lan-tx_dropped', 'wan-tx_bytes', 'wan-rx_bytes', + 'max_rx_bytes-r', + 'max_tx_bytes-r', 'wan2-tx_bytes', 'wan2-rx_bytes', 'latency_min', @@ -196,8 +198,8 @@ $load_perc = (($time_after_load - $time_after_login) / $time_total) * 100; $remain_perc = 100 - $login_perc - $load_perc; - $results['timings']['login'] = $time_after_login; - $results['timings']['load'] = $time_after_load; + $results['timings']['login'] = $time_after_login; + $results['timings']['load'] = $time_after_load; $results['timings']['login_perc'] = $login_perc; $results['timings']['load_perc'] = $load_perc; } diff --git a/ajax/fetch_sites.php b/ajax/fetch_sites.php index d95ebad..06b75d5 100755 --- a/ajax/fetch_sites.php +++ b/ajax/fetch_sites.php @@ -141,4 +141,4 @@ header('Content-Type: application/json; charset=utf-8'); echo (json_encode($results)); -$_SESSION['memory_used'] = round(memory_get_peak_usage(false) / 1024 / 1024, 2) . 'M'; +$_SESSION['memory_used'] = round(memory_get_peak_usage(false) / 1024 / 1024, 2) . 'M'; \ No newline at end of file diff --git a/ajax/show_api_debug.php b/ajax/show_api_debug.php index 0b1e537..65cbf2a 100755 --- a/ajax/show_api_debug.php +++ b/ajax/show_api_debug.php @@ -77,4 +77,4 @@ } } else { echo 'ignore'; -} +} \ No newline at end of file diff --git a/ajax/update_controller.php b/ajax/update_controller.php index 138d5ea..38bd861 100755 --- a/ajax/update_controller.php +++ b/ajax/update_controller.php @@ -56,4 +56,4 @@ * output the results with correct JSON formatting */ header('Content-Type: application/json; charset=utf-8'); -echo (json_encode($results)); +echo (json_encode($results)); \ No newline at end of file diff --git a/ajax/update_theme.php b/ajax/update_theme.php index 84bb072..d281515 100755 --- a/ajax/update_theme.php +++ b/ajax/update_theme.php @@ -53,4 +53,4 @@ * output the results with correct JSON formatting */ header('Content-Type: application/json; charset=utf-8'); -echo (json_encode($results)); +echo (json_encode($results)); \ No newline at end of file diff --git a/collections.php b/collections.php index 9fd5552..cc87e09 100755 --- a/collections.php +++ b/collections.php @@ -469,4 +469,4 @@ ], ], ], -]; +]; \ No newline at end of file diff --git a/common.php b/common.php index 69c7671..094e770 100755 --- a/common.php +++ b/common.php @@ -7,7 +7,7 @@ * with this package in the file LICENSE.md * */ -define('TOOL_VERSION', '2.0.8'); +define('TOOL_VERSION', '2.0.9'); /** * gather some basic information for the About modal diff --git a/composer.lock b/composer.lock index eeaa4d4..ca43dd4 100755 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "art-of-wifi/unifi-api-client", - "version": "v1.1.49", + "version": "v1.1.52", "source": { "type": "git", "url": "https://github.com/Art-of-WiFi/UniFi-API-client.git", - "reference": "903d3e47d56f3d17a33e716051d947890a64966a" + "reference": "badb615627ce6b7f10872825aa2c8ab2bc8b98f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Art-of-WiFi/UniFi-API-client/zipball/903d3e47d56f3d17a33e716051d947890a64966a", - "reference": "903d3e47d56f3d17a33e716051d947890a64966a", + "url": "https://api.github.com/repos/Art-of-WiFi/UniFi-API-client/zipball/badb615627ce6b7f10872825aa2c8ab2bc8b98f3", + "reference": "badb615627ce6b7f10872825aa2c8ab2bc8b98f3", "shasum": "" }, "require": { @@ -51,7 +51,7 @@ "ubiquiti", "unifi" ], - "time": "2020-02-07T07:27:39+00:00" + "time": "2020-04-14T12:59:00+00:00" }, { "name": "kint-php/kint", @@ -113,16 +113,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.13.1", + "version": "v1.15.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3" + "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14", + "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14", "shasum": "" }, "require": { @@ -134,7 +134,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "autoload": { @@ -167,20 +167,20 @@ "polyfill", "portable" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-02-27T09:26:54+00:00" }, { "name": "twig/twig", - "version": "v1.42.4", + "version": "v1.42.5", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152" + "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/e587180584c3d2d6cb864a0454e777bb6dcb6152", - "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e", + "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e", "shasum": "" }, "require": { @@ -189,8 +189,7 @@ }, "require-dev": { "psr/container": "^1.0", - "symfony/debug": "^3.4|^4.2", - "symfony/phpunit-bridge": "^4.4@dev|^5.0" + "symfony/phpunit-bridge": "^4.4|^5.0" }, "type": "library", "extra": { @@ -219,7 +218,6 @@ }, { "name": "Twig Team", - "homepage": "https://twig.symfony.com/contributors", "role": "Contributors" }, { @@ -233,7 +231,7 @@ "keywords": [ "templating" ], - "time": "2019-11-11T16:49:32+00:00" + "time": "2020-02-11T05:59:23+00:00" } ], "packages-dev": [], diff --git a/config/config-template.php b/config/config-template.php index 31ae919..a35fd99 100755 --- a/config/config-template.php +++ b/config/config-template.php @@ -50,4 +50,4 @@ // primary, secondary, success, danger, warning, info, light, dark, white, transparent $debug = false; // set to true (without quotes) to enable debug output to the browser and the PHP error log - // when fetching the sites collection after selecting a controller + // when fetching the sites collection after selecting a controller \ No newline at end of file diff --git a/config/users-template.php b/config/users-template.php index 25e1dd8..ec33048 100755 --- a/config/users-template.php +++ b/config/users-template.php @@ -35,4 +35,4 @@ 'user_name' => '', // string, the user name 'password' => '', // string, the SHA512 hash of the password ], -]; +]; \ No newline at end of file diff --git a/js/custom.js b/js/custom.js index 47115ad..2a69286 100755 --- a/js/custom.js +++ b/js/custom.js @@ -392,9 +392,9 @@ function fetchCollection() { 'Total time: ' + (json.timings.load + json.timings.login) + ' seconds' + '
' + '
API login time
' + + '%" aria-valuenow="' + json.timings.login_perc + ' aria-valuemin="0" aria-valuemax="100" data-toggle="tooltip" data-placement="top" title="API login and connect took ' + json.timings.login + ' seconds">API login
' + '
data load time
' + + '%" aria-valuenow="' + json.timings.load_perc + '" aria-valuemin="0" aria-valuemax="100" data-toggle="tooltip" data-placement="top" title="Data transfer took ' + json.timings.load + ' seconds">data transfer' + '' ) diff --git a/templates/components/about_modal.html.twig b/templates/components/about_modal.html.twig index bad6f83..1ce00f5 100755 --- a/templates/components/about_modal.html.twig +++ b/templates/components/about_modal.html.twig @@ -12,7 +12,7 @@
- A tool for browsing the data collections which are exposed through Ubiquiti's UniFi Controller API, created by Art of WiFi. + A tool for browsing the data collections that are exposed through Ubiquiti's UniFi Controller API, created by Art of WiFi.

diff --git a/vendor/art-of-wifi/unifi-api-client/README.md b/vendor/art-of-wifi/unifi-api-client/README.md index 7b1efec..a75a352 100755 --- a/vendor/art-of-wifi/unifi-api-client/README.md +++ b/vendor/art-of-wifi/unifi-api-client/README.md @@ -1,6 +1,6 @@ ## UniFi Controller API client class -A PHP class that provides access to Ubiquiti's [**UniFi SDN Controller**](https://unifi-sdn.ui.com/) API, versions 4.X.X and 5.X.X of the UniFi SDN Controller software are supported (version 5.12.35 has been confirmed to work) as well as UniFi OS-based controllers (version 5.12.59 has been confirmed to work). This class is used in our API browser tool which can be found [here](https://github.com/Art-of-WiFi/UniFi-API-browser). +A PHP class that provides access to Ubiquiti's [**UniFi SDN Controller**](https://unifi-sdn.ui.com/) API, versions 4.X.X and 5.X.X of the UniFi SDN Controller software are supported (version 5.12.66 has been confirmed to work) as well as UbiOS-based controllers (version 5.12.59 has been confirmed to work). This class is used in our API browser tool which can be found [here](https://github.com/Art-of-WiFi/UniFi-API-browser). The package can be installed manually or using composer/[packagist](https://packagist.org/packages/art-of-wifi/unifi-api-client) for easy inclusion in your projects. @@ -9,11 +9,11 @@ The package can be installed manually or using composer/[packagist](https://pack - a web server with PHP and cURL modules installed (tested on Apache 2.4 with PHP Version 5.6.1 and cURL 7.42.1 and with PHP 7.2.24 and cURL 7.58.0) - network connectivity between this web server and the server and port (normally TCP port 8443) where the UniFi Controller is running -## UniFi OS Support +## UbiOS Support -Support for UniFi OS-based controllers (UniFi Dream Machine Pro) has been added as of version 1.1.47. The class automatically detects UniFi OS devices and adjusts URLs and several functions/methods accordingly. If your own code applies strict validation of the URL that is passed to the constructor, please adapt your logic to allow URLs without a port suffix when dealing with a UniFi OS-based controller. +Support for UbiOS-based controllers (UniFi Dream Machine Pro) has been added as of version 1.1.47. The class automatically detects UbiOS devices and adjusts URLs and several functions/methods accordingly. If your own code applies strict validation of the URL that is passed to the constructor, please adapt your logic to allow URLs without a port suffix when dealing with a UbiOS-based controller. -Please test all methods you plan on using thoroughly before using the API Client with UniFi OS devices in a production environment. +Please test all methods you plan on using thoroughly before using the API Client with UbiOS devices in a production environment. ## Installation @@ -100,7 +100,7 @@ Please refer to the `examples/` directory for some more detailed examples which ## Functions/methods supported -The class currently supports the following functions/methods to GET/POST/PUT/DELETE data through the UniFi Controller API. Please refer to the source code for more details on the functions/methods and their respective parameters. +The class currently supports the following functions/methods to GET/POST/PUT/DELETE data through the UniFi Controller API. Please refer to the comments in the source code for more details on the functions/methods and their respective parameters. - login() - logout() @@ -242,15 +242,28 @@ The class currently supports the following functions/methods to GET/POST/PUT/DEL - cancel_rolling_upgrade() - cmd_stat() -Internal functions, getters/setters: +Other functions, getters/setters: - set_debug() - get_debug() - set_site() - get_site() -- get_cookie() (renamed from getcookie()) +- set_cookies() +- get_cookies() +- get_cookie() (renamed from getcookie(), deprecated but still available, use get_cookies() instead) - get_last_results_raw() - get_last_error_message() +- set_request_type() +- get_request_type() +- set_ssl_verify_peer() +- get_ssl_verify_peer() +- set_ssl_verify_host() +- get_ssl_verify_host() +- set_connection_timeout() +- get_connection_timeout() +- set_is_unifi_os() +- get_is_unifi_os() + ## Need help or have suggestions? diff --git a/vendor/art-of-wifi/unifi-api-client/examples/block_list.php b/vendor/art-of-wifi/unifi-api-client/examples/block_list.php index f8c4ecb..1166ade 100755 --- a/vendor/art-of-wifi/unifi-api-client/examples/block_list.php +++ b/vendor/art-of-wifi/unifi-api-client/examples/block_list.php @@ -47,7 +47,7 @@ $set_debug_mode = $unifi_connection->set_debug($debug); $loginresults = $unifi_connection->login(); // always true regardless of site id -foreach ($macs_to_block as &$mac) { +foreach ($macs_to_block as $mac) { // block_result is always true even if mac address does not exist :( $block_result = $unifi_connection->block_sta($mac); diff --git a/vendor/art-of-wifi/unifi-api-client/src/Client.php b/vendor/art-of-wifi/unifi-api-client/src/Client.php index e9bb12b..e97205a 100755 --- a/vendor/art-of-wifi/unifi-api-client/src/Client.php +++ b/vendor/art-of-wifi/unifi-api-client/src/Client.php @@ -32,6 +32,7 @@ class Client protected $debug = false; protected $is_loggedin = false; protected $is_unifi_os = false; + protected $exec_retries = 0; private $cookies = ''; private $request_type = 'GET'; private $request_types_allowed = ['GET', 'POST', 'PUT', 'DELETE']; @@ -132,96 +133,93 @@ public function login() } /** - * check whether we have a "regular" controller or one based on UniFi OS + * first we check whether we have a "regular" controller or one based on UniFi OS */ - if (!($ch = $this->get_curl_resource())) { - trigger_error('$ch as returned by get_curl_resource() is not a resource'); - } else { - curl_setopt($ch, CURLOPT_HEADER, true); - curl_setopt($ch, CURLOPT_POST, true); - curl_setopt($ch, CURLOPT_NOBODY, true); - curl_setopt($ch, CURLOPT_URL, $this->baseurl . '/'); + $ch = $this->get_curl_resource(); + curl_setopt($ch, CURLOPT_HEADER, true); + curl_setopt($ch, CURLOPT_POST, true); + curl_setopt($ch, CURLOPT_NOBODY, true); + curl_setopt($ch, CURLOPT_URL, $this->baseurl . '/'); - /** - * execute the cURL request and get the HTTP response code - */ - curl_exec($ch); - $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); - - if (curl_errno($ch)) { - trigger_error('cURL error: ' . curl_error($ch)); - } + /** + * execute the cURL request and get the HTTP response code + */ + curl_exec($ch); + $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); - if ($http_code === 200) { - $this->is_unifi_os = true; - } + if (curl_errno($ch)) { + trigger_error('cURL error: ' . curl_error($ch)); + } - if ($this->is_unifi_os) { - curl_setopt($ch, CURLOPT_REFERER, $this->baseurl . '/login'); - curl_setopt($ch, CURLOPT_URL, $this->baseurl . '/api/auth/login'); - } else { - curl_setopt($ch, CURLOPT_REFERER, $this->baseurl . '/login'); - curl_setopt($ch, CURLOPT_URL, $this->baseurl . '/api/login'); - } + if ($http_code === 200) { + $this->is_unifi_os = true; + curl_setopt($ch, CURLOPT_REFERER, $this->baseurl . '/login'); + curl_setopt($ch, CURLOPT_URL, $this->baseurl . '/api/auth/login'); + } else { + curl_setopt($ch, CURLOPT_REFERER, $this->baseurl . '/login'); + curl_setopt($ch, CURLOPT_URL, $this->baseurl . '/api/login'); + } - curl_setopt($ch, CURLOPT_NOBODY, false); - curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(['username' => $this->user, 'password' => $this->password])); - curl_setopt($ch, CURLOPT_HTTPHEADER, ['content-type: application/json; charset=utf-8']); + curl_setopt($ch, CURLOPT_NOBODY, false); + curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(['username' => $this->user, 'password' => $this->password])); + curl_setopt($ch, CURLOPT_HTTPHEADER, ['content-type: application/json; charset=utf-8']); - /** - * execute the cURL request and get the HTTP response code - */ - $content = curl_exec($ch); - $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); + /** + * execute the cURL request and get the HTTP response code + */ + $content = curl_exec($ch); + $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); - if (curl_errno($ch)) { - trigger_error('cURL error: ' . curl_error($ch)); - } + if (curl_errno($ch)) { + trigger_error('cURL error: ' . curl_error($ch)); + } - if ($this->debug) { - print PHP_EOL . '
';
-                print PHP_EOL . '-----------LOGIN-------------' . PHP_EOL;
-                print_r(curl_getinfo($ch));
-                print PHP_EOL . '----------RESPONSE-----------' . PHP_EOL;
-                print $content;
-                print PHP_EOL . '-----------------------------' . PHP_EOL;
-                print '
' . PHP_EOL; - } + if ($this->debug) { + print PHP_EOL . '
';
+            print PHP_EOL . '-----------LOGIN-------------' . PHP_EOL;
+            print_r(curl_getinfo($ch));
+            print PHP_EOL . '----------RESPONSE-----------' . PHP_EOL;
+            print $content;
+            print PHP_EOL . '-----------------------------' . PHP_EOL;
+            print '
' . PHP_EOL; + } - /** - * based on the HTTP response code we either trigger an error or - * extract the cookie from the headers - */ - if ($http_code === 400) { - trigger_error('We received an HTTP response status: 400. Probably a controller login failure'); + /** + * based on the HTTP response code we either trigger an error or + * extract the cookie from the headers + */ + if ($http_code === 400 || $http_code === 401) { + trigger_error("We received the following HTTP response status: $http_code. Probably a controller login failure"); - return $http_code; - } + return $http_code; + } - $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE); - $headers = substr($content, 0, $header_size); - $body = trim(substr($content, $header_size)); + $header_size = curl_getinfo($ch, CURLINFO_HEADER_SIZE); + $headers = substr($content, 0, $header_size); + $body = trim(substr($content, $header_size)); - curl_close($ch); + curl_close($ch); - if ($http_code >= 200 && $http_code < 400 && !empty($body)) { - preg_match_all('|Set-Cookie: (.*);|Ui', $headers, $results); - if (isset($results[1])) { - $this->cookies = implode(';', $results[1]); + /** + * we are good to extract the cookies + */ + if ($http_code >= 200 && $http_code < 400 && !empty($body)) { + preg_match_all('|Set-Cookie: (.*);|Ui', $headers, $results); + if (isset($results[1])) { + $this->cookies = implode(';', $results[1]); + /** + * accept cookies from regular UniFI controllers or from UniFi OS + */ + if (strpos($this->cookies, 'unifises') !== false || strpos($this->cookies, 'TOKEN') !== false) { /** - * accept cookies from regular UniFI controllers or from UniFi OS + * update the cookie value in $_SESSION['unificookie'], if it exists */ - if (strpos($this->cookies, 'unifises') !== false || strpos($this->cookies, 'TOKEN') !== false) { - /** - * update the cookie value in $_SESSION['unificookie'], if it exists - */ - if (isset($_SESSION['unificookie'])) { - $_SESSION['unificookie'] = $this->cookies; - } - - return $this->is_loggedin = true; + if (isset($_SESSION['unificookie'])) { + $_SESSION['unificookie'] = $this->cookies; } + + return $this->is_loggedin = true; } } } @@ -240,13 +238,42 @@ public function logout() return false; } + /** + * prepare cURL + */ + $ch = $this->get_curl_resource(); + curl_setopt($ch, CURLOPT_HEADER, true); + curl_setopt($ch, CURLOPT_POST, true); + + /** + * constuct HTTP request headers as required + */ + $headers = ['Content-Length: 0']; if ($this->is_unifi_os) { - $logout_url = '/api/auth/logout'; + $logout_path = '/api/auth/logout'; + curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST'); + + $csrf_token = $this->extract_csrf_token_from_cookie(); + if ($csrf_token) { + $headers[] = 'x-csrf-token: ' . $csrf_token; + } } else { - $logout_url = '/logout'; + $logout_path = '/logout'; + } + + curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + curl_setopt($ch, CURLOPT_URL, $this->baseurl . $logout_path); + + /** + * execute the cURL request to logout + */ + $logout = curl_exec($ch); + + if (curl_errno($ch)) { + trigger_error('cURL error: ' . curl_error($ch)); } - $this->exec_curl($logout_url, []); + curl_close($ch); $this->is_loggedin = false; $this->cookies = ''; @@ -3668,8 +3695,8 @@ public function get_last_error_message() } /** - * Get Cookie from UniFi controller - * -------------------------------- + * Get Cookie from UniFi controller (singular and plural) + * ------------------------------------------------------ * returns the UniFi controller cookie * * NOTES: @@ -3689,32 +3716,27 @@ public function get_cookie() return $this->cookies; } - /****************************************************************** - * other getter/setter functions/methods from here, use with care! - ******************************************************************/ public function get_cookies() { - return $this->cookies; - } + if (!$this->is_loggedin) { + return false; + } - public function get_request_type() - { - return $this->request_type; + return $this->cookies; } - public function get_ssl_verify_peer() - { - return $this->curl_ssl_verify_peer; - } + /****************************************************************** + * other getter/setter functions/methods from here, use with care! + ******************************************************************/ - public function get_ssl_verify_host() + public function set_cookies($cookies_value) { - return $this->curl_ssl_verify_host; + $this->cookies = $cookies_value; } - public function set_cookies($cookies_value) + public function get_request_type() { - $this->cookies = $cookies_value; + return $this->request_type; } public function set_request_type($request_type) @@ -3729,19 +3751,9 @@ public function set_request_type($request_type) return true; } - public function set_connection_timeout($timeout) - { - $this->connect_timeout = $timeout; - } - - public function set_last_results_raw($last_results) - { - $this->last_results_raw = $last_results; - } - - public function set_last_error_message($last_error_message) + public function get_ssl_verify_peer() { - $this->last_error_message = $last_error_message; + return $this->curl_ssl_verify_peer; } /** @@ -3759,6 +3771,11 @@ public function set_ssl_verify_peer($ssl_verify_peer) return true; } + public function get_ssl_verify_host() + { + return $this->curl_ssl_verify_host; + } + /** * set the value for cURL option CURLOPT_SSL_VERIFYHOST, should be 0/false or 2 * https://curl.haxx.se/libcurl/c/CURLOPT_SSL_VERIFYHOST.html @@ -3774,6 +3791,32 @@ public function set_ssl_verify_host($ssl_verify_host) return true; } + public function get_is_unifi_os() + { + return $this->is_unifi_os; + } + + public function set_is_unifi_os($is_unifi_os) + { + if (!in_array($is_unifi_os, [0, false, 1, true])) { + return false; + } + + $this->is_unifi_os = $is_unifi_os; + + return true; + } + + public function set_connection_timeout($timeout) + { + $this->connect_timeout = $timeout; + } + + public function get_connection_timeout() + { + return $this->connect_timeout; + } + /**************************************************************** * internal (private and protected) functions from here: ****************************************************************/ @@ -4049,64 +4092,85 @@ protected function exec_curl($path, $payload = null) trigger_error('cURL error: ' . curl_error($ch)); } + /** + * fetch the HTTP response code + */ + $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); + /** * an HTTP response code 401 (Unauthorized) indicates the Cookie/Token has expired in which case * we need to login again. */ - $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE); if ($http_code == 401) { - curl_close($ch); if ($this->debug) { - error_log('cURL debug: needed to reconnect to UniFi controller'); + error_log(__FUNCTION__ . ': needed to reconnect to UniFi controller'); } - /** - * explicitly clear the expired Cookie/Token before logging in again - */ - if (isset($_SESSION['unificookie'])) { - $_SESSION['unificookie'] = ''; + if ($this->exec_retries == 0) { + /** + * explicitly clear the expired Cookie/Token, update other properties and log out before logging in again + */ + if (isset($_SESSION['unificookie'])) { + $_SESSION['unificookie'] = ''; + } + $this->is_loggedin = false; - } + $this->exec_retries++; + curl_close($ch); - /** - * then login again - */ - $this->login(); + /** + * then login again + */ + $this->login(); - /** - * when login was successful, execute the same command again - */ - if ($this->is_loggedin) { - return $this->exec_curl($path, $payload); - } - } else { - if ($this->debug) { - print PHP_EOL . '
';
-                    print PHP_EOL . '---------cURL INFO-----------' . PHP_EOL;
-                    print_r(curl_getinfo($ch));
-                    print PHP_EOL . '-------URL & PAYLOAD---------' . PHP_EOL;
-                    print $url . PHP_EOL;
-                    if (empty($json_payload)) {
-                        print 'empty payload';
+                    /**
+                     * when re-login was successful, simply execute the same cURL request again
+                     */
+                    if ($this->is_loggedin) {
+                        if ($this->debug) {
+                            error_log(__FUNCTION__ . ': re-logged in, calling exec_curl again');
+                        }
+
+                        return $this->exec_curl($path, $payload);
                     } else {
-                        print $json_payload;
+                        if ($this->debug) {
+                            error_log(__FUNCTION__ . ': re-login failed');
+                        }
+
+                        return false;
                     }
+                } else {
+                    return false;
+                }
+            }
 
-                    print PHP_EOL . '----------RESPONSE-----------' . PHP_EOL;
-                    print $content;
-                    print PHP_EOL . '-----------------------------' . PHP_EOL;
-                    print '
' . PHP_EOL; + if ($this->debug) { + print PHP_EOL . '
';
+                print PHP_EOL . '---------cURL INFO-----------' . PHP_EOL;
+                print_r(curl_getinfo($ch));
+                print PHP_EOL . '-------URL & PAYLOAD---------' . PHP_EOL;
+                print $url . PHP_EOL;
+                if (empty($json_payload)) {
+                    print 'empty payload';
+                } else {
+                    print $json_payload;
                 }
 
-                curl_close($ch);
+                print PHP_EOL . '----------RESPONSE-----------' . PHP_EOL;
+                print $content;
+                print PHP_EOL . '-----------------------------' . PHP_EOL;
+                print '
' . PHP_EOL; + } - /** - * set request_type value back to default, just in case - */ - $this->request_type = 'GET'; + curl_close($ch); + + /** + * set request_type value back to default, just in case + */ + $this->request_type = 'GET'; + + return $content; - return $content; - } } return false; diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index c446cb9..9f8f4d9 100755 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1,24 +1,24 @@ [ { "name": "art-of-wifi/unifi-api-client", - "version": "v1.1.49", - "version_normalized": "1.1.49.0", + "version": "v1.1.52", + "version_normalized": "1.1.52.0", "source": { "type": "git", "url": "https://github.com/Art-of-WiFi/UniFi-API-client.git", - "reference": "903d3e47d56f3d17a33e716051d947890a64966a" + "reference": "badb615627ce6b7f10872825aa2c8ab2bc8b98f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Art-of-WiFi/UniFi-API-client/zipball/903d3e47d56f3d17a33e716051d947890a64966a", - "reference": "903d3e47d56f3d17a33e716051d947890a64966a", + "url": "https://api.github.com/repos/Art-of-WiFi/UniFi-API-client/zipball/badb615627ce6b7f10872825aa2c8ab2bc8b98f3", + "reference": "badb615627ce6b7f10872825aa2c8ab2bc8b98f3", "shasum": "" }, "require": { "ext-curl": "*", "php": ">=5.4.0" }, - "time": "2020-02-07T07:27:39+00:00", + "time": "2020-04-14T12:59:00+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -110,17 +110,17 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.13.1", - "version_normalized": "1.13.1.0", + "version": "v1.15.0", + "version_normalized": "1.15.0.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3" + "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14", + "reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14", "shasum": "" }, "require": { @@ -129,11 +129,11 @@ "suggest": { "ext-ctype": "For best performance" }, - "time": "2019-11-27T13:56:44+00:00", + "time": "2020-02-27T09:26:54+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } }, "installation-source": "dist", @@ -170,17 +170,17 @@ }, { "name": "twig/twig", - "version": "v1.42.4", - "version_normalized": "1.42.4.0", + "version": "v1.42.5", + "version_normalized": "1.42.5.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152" + "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/e587180584c3d2d6cb864a0454e777bb6dcb6152", - "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e", + "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e", "shasum": "" }, "require": { @@ -189,10 +189,9 @@ }, "require-dev": { "psr/container": "^1.0", - "symfony/debug": "^3.4|^4.2", - "symfony/phpunit-bridge": "^4.4@dev|^5.0" + "symfony/phpunit-bridge": "^4.4|^5.0" }, - "time": "2019-11-11T16:49:32+00:00", + "time": "2020-02-11T05:59:23+00:00", "type": "library", "extra": { "branch-alias": { @@ -221,7 +220,6 @@ }, { "name": "Twig Team", - "homepage": "https://twig.symfony.com/contributors", "role": "Contributors" }, { diff --git a/vendor/symfony/polyfill-ctype/composer.json b/vendor/symfony/polyfill-ctype/composer.json index 2a2ea04..71d436e 100644 --- a/vendor/symfony/polyfill-ctype/composer.json +++ b/vendor/symfony/polyfill-ctype/composer.json @@ -28,7 +28,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.15-dev" } } } diff --git a/vendor/twig/twig/CHANGELOG b/vendor/twig/twig/CHANGELOG index b9833e5..e549c93 100644 --- a/vendor/twig/twig/CHANGELOG +++ b/vendor/twig/twig/CHANGELOG @@ -1,3 +1,7 @@ +* 1.42.5 (2020-02-11) + + * Fix implementation of case-insensitivity for method names + * 1.42.4 (2019-11-11) * optimized "block('foo') ?? 'bar" diff --git a/vendor/twig/twig/LICENSE b/vendor/twig/twig/LICENSE index d06ced2..5e8a0b8 100644 --- a/vendor/twig/twig/LICENSE +++ b/vendor/twig/twig/LICENSE @@ -1,6 +1,4 @@ -Copyright (c) 2009-2019 by the Twig Team. - -Some rights reserved. +Copyright (c) 2009-2020 by the Twig Team. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/vendor/twig/twig/composer.json b/vendor/twig/twig/composer.json index 9807aa7..c306353 100644 --- a/vendor/twig/twig/composer.json +++ b/vendor/twig/twig/composer.json @@ -14,7 +14,6 @@ }, { "name": "Twig Team", - "homepage": "https://twig.symfony.com/contributors", "role": "Contributors" }, { @@ -28,8 +27,7 @@ "symfony/polyfill-ctype": "^1.8" }, "require-dev": { - "symfony/phpunit-bridge": "^4.4@dev|^5.0", - "symfony/debug": "^3.4|^4.2", + "symfony/phpunit-bridge": "^4.4|^5.0", "psr/container": "^1.0" }, "autoload": { diff --git a/vendor/twig/twig/doc/advanced.rst b/vendor/twig/twig/doc/advanced.rst index e253294..2b0053b 100644 --- a/vendor/twig/twig/doc/advanced.rst +++ b/vendor/twig/twig/doc/advanced.rst @@ -584,11 +584,6 @@ to host all the specific tags and filters you want to add to Twig. recompile your templates whenever you make a change to it (when ``auto_reload`` is enabled). -.. note:: - - Before writing your own extensions, have a look at the Twig official - extension repository: https://github.com/twigphp/Twig-extensions. - An extension is a class that implements the following interface:: interface Twig_ExtensionInterface @@ -665,7 +660,7 @@ An extension is a class that implements the following interface:: To keep your extension class clean and lean, inherit from the built-in ``\Twig\Extension\AbstractExtension`` class instead of implementing the interface as it provides -empty implementations for all methods: +empty implementations for all methods:: class Project_Twig_Extension extends \Twig\Extension\AbstractExtension { diff --git a/vendor/twig/twig/doc/advanced_legacy.rst b/vendor/twig/twig/doc/advanced_legacy.rst index cc87b9c..409b914 100644 --- a/vendor/twig/twig/doc/advanced_legacy.rst +++ b/vendor/twig/twig/doc/advanced_legacy.rst @@ -524,11 +524,6 @@ to host all the specific tags and filters you want to add to Twig. recompile your templates whenever you make a change to it (when the ``auto_reload`` is enabled). -.. note:: - - Before writing your own extensions, have a look at the Twig official - extension repository: https://github.com/twigphp/Twig-extensions. - An extension is a class that implements the following interface:: interface Twig_ExtensionInterface diff --git a/vendor/twig/twig/doc/api.rst b/vendor/twig/twig/doc/api.rst index b96b0d4..40ccd69 100644 --- a/vendor/twig/twig/doc/api.rst +++ b/vendor/twig/twig/doc/api.rst @@ -19,8 +19,7 @@ to have multiple environments side by side, with different configurations. The typical way to configure Twig to load templates for an application looks roughly like this:: - require_once '/path/to/lib/Twig/Autoloader.php'; - Twig_Autoloader::register(); + require_once '/path/to/vendor/autoload.php'; $loader = new \Twig\Loader\FilesystemLoader('/path/to/templates'); $twig = new \Twig\Environment($loader, [ @@ -357,8 +356,8 @@ This section describes the features added by the built-in extensions. .. tip:: - Read the chapter about extending Twig to learn how to create your own - extensions. + Read the chapter about :doc:`extending Twig ` to learn how to + create your own extensions. Core Extension ~~~~~~~~~~~~~~ @@ -417,7 +416,7 @@ The escaping rules are implemented as follows: {% set text = "Twig
" %} {{ text }} {# will be escaped #} -* Expressions which the result is always a literal or a variable marked safe +* Expressions which the result is a literal or a variable marked safe are never automatically escaped: .. code-block:: twig @@ -425,14 +424,12 @@ The escaping rules are implemented as follows: {{ foo ? "Twig
" : "
Twig" }} {# won't be escaped #} {% set text = "Twig
" %} - {{ foo ? text : "
Twig" }} {# will be escaped #} + {{ true ? text : "
Twig" }} {# will be escaped #} + {{ false ? text : "
Twig" }} {# won't be escaped #} {% set text = "Twig
" %} {{ foo ? text|raw : "
Twig" }} {# won't be escaped #} - {% set text = "Twig
" %} - {{ foo ? text|escape : "
Twig" }} {# the result of the expression won't be escaped #} - * Escaping is applied before printing, after any other filter is applied: .. code-block:: twig diff --git a/vendor/twig/twig/doc/filters/filter.rst b/vendor/twig/twig/doc/filters/filter.rst index 310e63a..e9f9682 100644 --- a/vendor/twig/twig/doc/filters/filter.rst +++ b/vendor/twig/twig/doc/filters/filter.rst @@ -1,5 +1,5 @@ ``filter`` -========= +========== .. versionadded:: 1.41 The ``filter`` filter was added in Twig 1.41 and 2.10. diff --git a/vendor/twig/twig/doc/filters/reduce.rst b/vendor/twig/twig/doc/filters/reduce.rst index fd38967..af6164a 100644 --- a/vendor/twig/twig/doc/filters/reduce.rst +++ b/vendor/twig/twig/doc/filters/reduce.rst @@ -1,5 +1,5 @@ ``reduce`` -========= +========== .. versionadded:: 1.41 The ``reduce`` filter was added in Twig 1.41 and 2.10. diff --git a/vendor/twig/twig/doc/functions/block.rst b/vendor/twig/twig/doc/functions/block.rst index c626148..927fc32 100644 --- a/vendor/twig/twig/doc/functions/block.rst +++ b/vendor/twig/twig/doc/functions/block.rst @@ -1,10 +1,10 @@ ``block`` ========= -.. versionadded: 1.28 +.. versionadded:: 1.28 Using ``block`` with the ``defined`` test was added in Twig 1.28. -.. versionadded: 1.28 +.. versionadded:: 1.28 Support for the template argument was added in Twig 1.28. When a template uses inheritance and if you want to print a block multiple diff --git a/vendor/twig/twig/doc/functions/constant.rst b/vendor/twig/twig/doc/functions/constant.rst index f9d836c..bb19858 100644 --- a/vendor/twig/twig/doc/functions/constant.rst +++ b/vendor/twig/twig/doc/functions/constant.rst @@ -1,10 +1,10 @@ ``constant`` ============ -.. versionadded: 1.12.1 +.. versionadded:: 1.12.1 constant now accepts object instances as the second argument. -.. versionadded: 1.28 +.. versionadded:: 1.28 Using ``constant`` with the ``defined`` test was added in Twig 1.28. ``constant`` returns the constant value for a given string: diff --git a/vendor/twig/twig/doc/templates.rst b/vendor/twig/twig/doc/templates.rst index 168a8f7..adf2b53 100644 --- a/vendor/twig/twig/doc/templates.rst +++ b/vendor/twig/twig/doc/templates.rst @@ -865,11 +865,8 @@ the modifiers on one side of a tag or on both sides: Extensions ---------- -Twig can be extended. If you are looking for new tags, filters, or functions, -have a look at the Twig official `extension repository`_. - -If you want to create your own, read the :ref:`Creating an -Extension` chapter. +Twig can be extended. If you want to create your own extensions, read the +:ref:`Creating an Extension ` chapter. .. _`Twig bundle`: https://github.com/Anomareh/PHP-Twig.tmbundle .. _`Jinja syntax plugin`: http://jinja.pocoo.org/docs/integration/#vim @@ -877,7 +874,6 @@ Extension` chapter. .. _`Twig syntax plugin`: http://plugins.netbeans.org/plugin/37069/php-twig .. _`Twig plugin`: https://github.com/pulse00/Twig-Eclipse-Plugin .. _`Twig language definition`: https://github.com/gabrielcorpse/gedit-twig-template-language -.. _`extension repository`: https://github.com/twigphp/Twig-extensions .. _`Twig syntax mode`: https://github.com/bobthecow/Twig-HTML.mode .. _`other Twig syntax mode`: https://github.com/muxx/Twig-HTML.mode .. _`Notepad++ Twig Highlighter`: https://github.com/Banane9/notepadplusplus-twig diff --git a/vendor/twig/twig/doc/tests/constant.rst b/vendor/twig/twig/doc/tests/constant.rst index 98abf4d..5dc87e3 100644 --- a/vendor/twig/twig/doc/tests/constant.rst +++ b/vendor/twig/twig/doc/tests/constant.rst @@ -1,7 +1,7 @@ ``constant`` ============ -.. versionadded: 1.13.1 +.. versionadded:: 1.13.1 constant now accepts object instances as the second argument. ``constant`` checks if a variable has the exact same value as a constant. You diff --git a/vendor/twig/twig/doc/tests/sameas.rst b/vendor/twig/twig/doc/tests/sameas.rst index 4fc267d..b400b89 100644 --- a/vendor/twig/twig/doc/tests/sameas.rst +++ b/vendor/twig/twig/doc/tests/sameas.rst @@ -5,7 +5,7 @@ The ``same as`` test was added in Twig 1.14.2 as an alias for ``sameas``. ``same as`` checks if a variable is the same as another variable. -This is the equivalent to ``===`` in PHP: +This is equivalent to ``===`` in PHP: .. code-block:: twig diff --git a/vendor/twig/twig/drupal_test.sh b/vendor/twig/twig/drupal_test.sh index 0374593..d71aad8 100755 --- a/vendor/twig/twig/drupal_test.sh +++ b/vendor/twig/twig/drupal_test.sh @@ -17,7 +17,6 @@ source output wget https://get.symfony.com/cli/installer -O - | bash export PATH="$HOME/.symfony/bin:$PATH" symfony server:start -d --no-tls -ENDPOINT=`symfony server:status -no-ansi | sed -E 's/^.+ http/http/'` curl -OLsS https://get.blackfire.io/blackfire-player.phar chmod +x blackfire-player.phar @@ -47,5 +46,5 @@ scenario click link('Structure') expect status_code() == 200 EOF -./blackfire-player.phar run drupal-tests.bkf --endpoint=$ENDPOINT --variable name=$DRUPAL_Username --variable pass=$DRUPAL_Password +./blackfire-player.phar run drupal-tests.bkf --endpoint=`symfony var:export SYMFONY_DEFAULT_ROUTE_URL` --variable name=$DRUPAL_Username --variable pass=$DRUPAL_Password symfony server:stop diff --git a/vendor/twig/twig/ext/twig/php_twig.h b/vendor/twig/twig/ext/twig/php_twig.h index 6cc47b6..344539a 100644 --- a/vendor/twig/twig/ext/twig/php_twig.h +++ b/vendor/twig/twig/ext/twig/php_twig.h @@ -15,7 +15,7 @@ #ifndef PHP_TWIG_H #define PHP_TWIG_H -#define PHP_TWIG_VERSION "1.42.4" +#define PHP_TWIG_VERSION "1.42.5-DEV" #include "php.h" diff --git a/vendor/twig/twig/src/Environment.php b/vendor/twig/twig/src/Environment.php index 1f80f3a..97fa4c4 100644 --- a/vendor/twig/twig/src/Environment.php +++ b/vendor/twig/twig/src/Environment.php @@ -41,11 +41,11 @@ */ class Environment { - const VERSION = '1.42.4'; - const VERSION_ID = 14204; + const VERSION = '1.42.5'; + const VERSION_ID = 14205; const MAJOR_VERSION = 1; const MINOR_VERSION = 42; - const RELEASE_VERSION = 4; + const RELEASE_VERSION = 5; const EXTRA_VERSION = ''; protected $charset; diff --git a/vendor/twig/twig/src/ExpressionParser.php b/vendor/twig/twig/src/ExpressionParser.php index 9066ade..a3ff725 100644 --- a/vendor/twig/twig/src/ExpressionParser.php +++ b/vendor/twig/twig/src/ExpressionParser.php @@ -657,7 +657,7 @@ public function parseAssignmentExpression() $stream->expect(Token::NAME_TYPE, null, 'Only variables can be assigned to'); } $value = $token->getValue(); - if (\in_array(strtolower($value), ['true', 'false', 'none', 'null'])) { + if (\in_array(strtr($value, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), ['true', 'false', 'none', 'null'])) { throw new SyntaxError(sprintf('You cannot assign a value to "%s".', $value), $token->getLine(), $stream->getSourceContext()); } $targets[] = new AssignNameExpression($value, $token->getLine()); diff --git a/vendor/twig/twig/src/Extension/CoreExtension.php b/vendor/twig/twig/src/Extension/CoreExtension.php index 5f3cc24..5ff1e39 100644 --- a/vendor/twig/twig/src/Extension/CoreExtension.php +++ b/vendor/twig/twig/src/Extension/CoreExtension.php @@ -459,7 +459,7 @@ function twig_date_modify_filter(Environment $env, $date, $modifier) * @param \DateTime|\DateTimeInterface|string|null $date A date * @param \DateTimeZone|string|false|null $timezone The target timezone, null to use the default, false to leave unchanged * - * @return \DateTime + * @return \DateTimeInterface */ function twig_date_converter(Environment $env, $date = null, $timezone = null) { diff --git a/vendor/twig/twig/src/Parser.php b/vendor/twig/twig/src/Parser.php index 0ea102c..9fb6a83 100644 --- a/vendor/twig/twig/src/Parser.php +++ b/vendor/twig/twig/src/Parser.php @@ -299,7 +299,7 @@ public function isReservedMacroName($name) $this->reservedMacroNames = []; $r = new \ReflectionClass($this->env->getBaseTemplateClass()); foreach ($r->getMethods() as $method) { - $methodName = strtolower($method->getName()); + $methodName = strtr($method->getName(), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'); if ('get' === substr($methodName, 0, 3) && isset($methodName[3])) { $this->reservedMacroNames[] = substr($methodName, 3); @@ -307,7 +307,7 @@ public function isReservedMacroName($name) } } - return \in_array(strtolower($name), $this->reservedMacroNames); + return \in_array(strtr($name, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), $this->reservedMacroNames); } public function addTrait($trait) diff --git a/vendor/twig/twig/src/Sandbox/SecurityPolicy.php b/vendor/twig/twig/src/Sandbox/SecurityPolicy.php index 31b6c34..6038435 100644 --- a/vendor/twig/twig/src/Sandbox/SecurityPolicy.php +++ b/vendor/twig/twig/src/Sandbox/SecurityPolicy.php @@ -51,7 +51,7 @@ public function setAllowedMethods(array $methods) { $this->allowedMethods = []; foreach ($methods as $class => $m) { - $this->allowedMethods[$class] = array_map('strtolower', \is_array($m) ? $m : [$m]); + $this->allowedMethods[$class] = array_map(function ($value) { return strtr($value, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'); }, \is_array($m) ? $m : [$m]); } } @@ -93,7 +93,7 @@ public function checkMethodAllowed($obj, $method) } $allowed = false; - $method = strtolower($method); + $method = strtr($method, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'); foreach ($this->allowedMethods as $class => $methods) { if ($obj instanceof $class) { $allowed = \in_array($method, $methods); diff --git a/vendor/twig/twig/src/Template.php b/vendor/twig/twig/src/Template.php index 3f7447c..704125e 100644 --- a/vendor/twig/twig/src/Template.php +++ b/vendor/twig/twig/src/Template.php @@ -628,7 +628,7 @@ protected function getAttribute($object, $item, array $arguments = [], $type = s foreach ($ref->getMethods(\ReflectionMethod::IS_PUBLIC) as $refMethod) { // Accessing the environment from templates is forbidden to prevent untrusted changes to the environment - if ('getenvironment' !== strtolower($refMethod->name)) { + if ('getenvironment' !== strtr($refMethod->name, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')) { $methods[] = $refMethod->name; } } @@ -642,7 +642,7 @@ protected function getAttribute($object, $item, array $arguments = [], $type = s foreach ($methods as $method) { $cache[$method] = $method; - $cache[$lcName = strtolower($method)] = $method; + $cache[$lcName = strtr($method, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')] = $method; if ('g' === $lcName[0] && 0 === strpos($lcName, 'get')) { $name = substr($method, 3); @@ -670,7 +670,7 @@ protected function getAttribute($object, $item, array $arguments = [], $type = s $call = false; if (isset(self::$cache[$class][$item])) { $method = self::$cache[$class][$item]; - } elseif (isset(self::$cache[$class][$lcItem = strtolower($item)])) { + } elseif (isset(self::$cache[$class][$lcItem = strtr($item, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')])) { $method = self::$cache[$class][$lcItem]; } elseif (isset(self::$cache[$class]['__call'])) { $method = $item;