3 Commits fb127e2d05 ... 870157897d

Author SHA1 Message Date
  Hugo Sales 870157897d [DEPENDENCIES] Update dependencies and use my version of XML_XRD while it get's merged upstream (fixes deprecation warnings) 2 years ago
  Hugo Sales 584a0d8fed [DOCKER][Redis][PLUGIN][OAuth2] Temporarily disable redis protected mode and fix permission of OAuth2 keys 2 years ago
  Hugo Sales a44e64ed7a [DEPENDENCIES] Explicitly add pear/xml_xrd as a dependency 2 years ago
4 changed files with 49 additions and 69 deletions
  1. 13 0
      composer.json
  2. 33 67
      composer.lock
  3. 2 2
      docker/redis/redis.conf
  4. 1 0
      plugins/OAuth2/bin/install.sh

+ 13 - 0
composer.json

@@ -22,6 +22,7 @@
     "nyholm/psr7": "^1.4",
     "odolbeau/phone-number-bundle": "^3.1",
     "oro/doctrine-extensions": "^2.0",
+    "pear/xml_xrd": "^0.3.1",
     "php-ds/php-ds": "^1.2",
     "phpdocumentor/reflection-docblock": "^5.2",
     "sensio/framework-extra-bundle": "6.*",
@@ -219,6 +220,18 @@
           "reference": "509dd3d"
         }
       }
+    },
+    {
+      "type": "package",
+      "package": {
+        "name": "pear/xml_xrd",
+        "version": "0.3.1",
+        "source": {
+          "url": "https://github.com/someonewithpc/XML_XRD.git",
+          "type": "git",
+          "reference": "master"
+        }
+      }
     }
   ]
 }

+ 33 - 67
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "c253d454ba2e1b59479f5923b1858cf2",
+    "content-hash": "d0f9f494c61634b9e4e304c2c862a6d0",
     "packages": [
         {
             "name": "composer/ca-bundle",
@@ -550,16 +550,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.5.0",
+            "version": "3.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "b66f55c7037402d9f522f19d86841e71c09f0195"
+                "reference": "f38ee8aaca2d58ee88653cb34a6a3880c23f38a5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/b66f55c7037402d9f522f19d86841e71c09f0195",
-                "reference": "b66f55c7037402d9f522f19d86841e71c09f0195",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/f38ee8aaca2d58ee88653cb34a6a3880c23f38a5",
+                "reference": "f38ee8aaca2d58ee88653cb34a6a3880c23f38a5",
                 "shasum": ""
             },
             "require": {
@@ -641,7 +641,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.5.0"
+                "source": "https://github.com/doctrine/dbal/tree/3.5.1"
             },
             "funding": [
                 {
@@ -657,7 +657,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-22T14:33:42+00:00"
+            "time": "2022-10-24T07:26:18+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -2268,16 +2268,16 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "2.4.1",
+            "version": "2.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379"
+                "reference": "3148458748274be1546f8f2809a6c09fe66f44aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/69568e4293f4fa993f3b0e51c9723e1e17c41379",
-                "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/3148458748274be1546f8f2809a6c09fe66f44aa",
+                "reference": "3148458748274be1546f8f2809a6c09fe66f44aa",
                 "shasum": ""
             },
             "require": {
@@ -2367,7 +2367,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/2.4.1"
+                "source": "https://github.com/guzzle/psr7/tree/2.4.2"
             },
             "funding": [
                 {
@@ -2383,7 +2383,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-08-28T14:45:39+00:00"
+            "time": "2022-10-25T13:49:28+00:00"
         },
         {
             "name": "jcupitt/vips",
@@ -3750,16 +3750,16 @@
         },
         {
             "name": "odolbeau/phone-number-bundle",
-            "version": "v3.7.0",
+            "version": "v3.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/odolbeau/phone-number-bundle.git",
-                "reference": "5a0b0475c603e7b5ac95384c2d6d7d054ee478d4"
+                "reference": "40e330c21d24903fac53aca5acb4b2ebce7a38a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/odolbeau/phone-number-bundle/zipball/5a0b0475c603e7b5ac95384c2d6d7d054ee478d4",
-                "reference": "5a0b0475c603e7b5ac95384c2d6d7d054ee478d4",
+                "url": "https://api.github.com/repos/odolbeau/phone-number-bundle/zipball/40e330c21d24903fac53aca5acb4b2ebce7a38a3",
+                "reference": "40e330c21d24903fac53aca5acb4b2ebce7a38a3",
                 "shasum": ""
             },
             "require": {
@@ -3818,9 +3818,9 @@
             ],
             "support": {
                 "issues": "https://github.com/odolbeau/phone-number-bundle/issues",
-                "source": "https://github.com/odolbeau/phone-number-bundle/tree/v3.7.0"
+                "source": "https://github.com/odolbeau/phone-number-bundle/tree/v3.8.0"
             },
-            "time": "2022-07-04T07:17:37+00:00"
+            "time": "2022-10-24T08:51:32+00:00"
         },
         {
             "name": "oro/doctrine-extensions",
@@ -4002,47 +4002,13 @@
         },
         {
             "name": "pear/xml_xrd",
-            "version": "v0.3.1",
+            "version": "0.3.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/pear/XML_XRD.git",
-                "reference": "3bddf158be71c60cfa95372224d21d272996dcac"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pear/XML_XRD/zipball/3bddf158be71c60cfa95372224d21d272996dcac",
-                "reference": "3bddf158be71c60cfa95372224d21d272996dcac",
-                "shasum": ""
-            },
-            "require-dev": {
-                "phpunit/phpunit": "*"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                "src/"
-            ],
-            "license": [
-                "LGPL"
-            ],
-            "authors": [
-                {
-                    "name": "Christian Weiske",
-                    "email": "cweiske@php.net",
-                    "role": "Lead"
-                }
-            ],
-            "description": "PHP library to parse and generate \"Extensible Resource Descriptor (XRD) Version 1.0\" files",
-            "support": {
-                "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=XML_XRD",
-                "source": "https://github.com/pear/XML_XRD"
+                "url": "https://github.com/someonewithpc/XML_XRD.git",
+                "reference": "master"
             },
-            "time": "2014-07-17T20:50:27+00:00"
+            "type": "library"
         },
         {
             "name": "php-ds/php-ds",
@@ -4409,16 +4375,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.16",
+            "version": "3.0.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "7181378909ed8890be4db53d289faac5b77f8b05"
+                "reference": "dbc2307d5c69aeb22db136c52e91130d7f2ca761"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/7181378909ed8890be4db53d289faac5b77f8b05",
-                "reference": "7181378909ed8890be4db53d289faac5b77f8b05",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/dbc2307d5c69aeb22db136c52e91130d7f2ca761",
+                "reference": "dbc2307d5c69aeb22db136c52e91130d7f2ca761",
                 "shasum": ""
             },
             "require": {
@@ -4499,7 +4465,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.16"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.17"
             },
             "funding": [
                 {
@@ -4515,7 +4481,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-09-05T18:03:08+00:00"
+            "time": "2022-10-24T10:51:50+00:00"
         },
         {
             "name": "psr/cache",
@@ -12140,12 +12106,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "cfd6be1e289dce23fabc73a4b41c2fcd70272b08"
+                "reference": "249aeacc6a489515e911540539e1d6295de65d0d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/cfd6be1e289dce23fabc73a4b41c2fcd70272b08",
-                "reference": "cfd6be1e289dce23fabc73a4b41c2fcd70272b08",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/249aeacc6a489515e911540539e1d6295de65d0d",
+                "reference": "249aeacc6a489515e911540539e1d6295de65d0d",
                 "shasum": ""
             },
             "require": {
@@ -12192,7 +12158,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-23T13:20:50+00:00"
+            "time": "2022-10-25T21:13:16+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

+ 2 - 2
docker/redis/redis.conf

@@ -84,7 +84,7 @@ bind redis 127.0.0.1
 # you are sure you want clients from other hosts to connect to Redis
 # even if no authentication is configured, nor a specific set of interfaces
 # are explicitly listed using the "bind" directive.
-protected-mode yes
+protected-mode no
 
 # Accept connections on the specified port, default is 6379 (IANA #815344).
 # If port 0 is specified Redis will not listen on a TCP socket.
@@ -1874,4 +1874,4 @@ jemalloc-bg-thread yes
 # by setting the following config which takes a space delimited list of warnings
 # to suppress
 #
-# ignore-warnings ARM64-COW-BUG
+# ignore-warnings ARM64-COW-BUG

+ 1 - 0
plugins/OAuth2/bin/install.sh

@@ -9,6 +9,7 @@ if [ ! -f private.key ]; then
     openssl rsa -in private.key -pubout -out public.key
 
     chown www-data:www-data private.key public.key
+    chmod 600 private.key public.key
 else
     echo "Keys exist, nothing to do"
 fi