Hi,
I have enabled SAML2 login support following official Docs. It works without any problems but now I am getting validation error about “composer.json” and “composer.lock” files:
WARN: Your local git contains modified files, this could prevent automatic updates.
Fix:
You can fix this with ./scripts/github-remove
Modified Files
composer.json
composer.lock
And here is git status and diff:
librenms@nms:~$ git status
On branch master
Your branch is up to date with 'origin/master'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: composer.json
modified: composer.lock
no changes added to commit (use "git add" and/or "git commit -a")
librenms@nms:~$ git diff
diff --git a/composer.json b/composer.json
index af8168f4c..35e02eaa9 100644
--- a/composer.json
+++ b/composer.json
@@ -55,6 +55,7 @@
"predis/predis": "^2.0",
"silber/bouncer": "^1.0",
"socialiteproviders/manager": "^4.3",
+ "socialiteproviders/saml2": "^4.7",
"spatie/laravel-ignition": "^2.0",
"symfony/yaml": "^6.2",
"tecnickcom/tcpdf": "^6.4",
diff --git a/composer.lock b/composer.lock
index 0d55105c9..ce90ab9ba 100644
--- a/composer.lock
+++ b/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": "fee5d24447dced4397e26066f8c9ee59",
+ "content-hash": "6287dd14152fb22884a8dba1d135b0dc",
"packages": [
{
"name": "amenadiel/jpgraph",
@@ -3266,6 +3266,75 @@
},
"time": "2024-08-15T15:23:53+00:00"
},
+ {
+ "name": "litesaml/lightsaml",
+ "version": "v4.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/litesaml/lightsaml.git",
+ "reference": "da88de24e699418918a128f0142dd09e2c41dd38"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/litesaml/lightsaml/zipball/da88de24e699418918a128f0142dd09e2c41dd38",
+ "reference": "da88de24e699418918a128f0142dd09e2c41dd38",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=7.4",
+ "psr/event-dispatcher": "^1.0",
+ "robrichards/xmlseclibs": "~2.0|~3.0|~4.0",
+ "symfony/http-foundation": "~5.0|~6.0|~7.0"
+ },
+ "require-dev": {
+ "litesaml/schemas": "~1.0.0",
+ "marcocesarato/php-conventional-changelog": "^1.15",
+ "monolog/monolog": "^2.0|^3.0",
+ "phpstan/phpstan": "^1.8",
+ "phpunit/phpunit": "~8.4|~9.5",
+ "pimple/pimple": "~3.0",
+ "squizlabs/php_codesniffer": "^3.6",
+ "symfony/css-selector": "~5.0|~6.0|~7.0",
+ "symfony/dom-crawler": "~5.0|~6.0|~7.0"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "LightSaml\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "William",
+ "email": "[email protected]"
+ },
+ {
+ "name": "Milos Tomic",
+ "email": "[email protected]",
+ "homepage": "https://github.com/tmilos/",
+ "role": "Developer"
+ }
+ ],
+ "description": "SAML 2.0 PHP library",
+ "keywords": [
+ "SAML 2.0",
+ "Single Logout",
+ "Single SignOn",
+ "library",
+ "lightSAML",
+ "php"
+ ],
+ "support": {
+ "docs": "https://docs.litesaml.com",
+ "issues": "https://github.com/litesaml/lightsaml/issues",
+ "source": "https://github.com/litesaml/lightsaml"
+ },
+ "time": "2024-02-08T11:59:00+00:00"
+ },
{
"name": "mews/purifier",
"version": "3.4.2",
@@ -5838,6 +5907,48 @@
],
"time": "2024-04-27T21:32:50+00:00"
},
+ {
+ "name": "robrichards/xmlseclibs",
+ "version": "3.1.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/robrichards/xmlseclibs.git",
+ "reference": "2bdfd742624d739dfadbd415f00181b4a77aaf07"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/2bdfd742624d739dfadbd415f00181b4a77aaf07",
+ "reference": "2bdfd742624d739dfadbd415f00181b4a77aaf07",
+ "shasum": ""
+ },
+ "require": {
+ "ext-openssl": "*",
+ "php": ">= 5.4"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "RobRichards\\XMLSecLibs\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "description": "A PHP library for XML Security",
+ "homepage": "https://github.com/robrichards/xmlseclibs",
+ "keywords": [
+ "security",
+ "signature",
+ "xml",
+ "xmldsig"
+ ],
+ "support": {
+ "issues": "https://github.com/robrichards/xmlseclibs/issues",
+ "source": "https://github.com/robrichards/xmlseclibs/tree/3.1.3"
+ },
+ "time": "2024-11-20T21:13:56+00:00"
+ },
{
"name": "silber/bouncer",
"version": "v1.0.1",
@@ -5987,6 +6098,57 @@
},
"time": "2024-11-10T01:56:18+00:00"
},
+ {
+ "name": "socialiteproviders/saml2",
+ "version": "4.7.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/SocialiteProviders/Saml2.git",
+ "reference": "ae108f5ca999c40f301d397988d905f4ba2df653"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/SocialiteProviders/Saml2/zipball/ae108f5ca999c40f301d397988d905f4ba2df653",
+ "reference": "ae108f5ca999c40f301d397988d905f4ba2df653",
+ "shasum": ""
+ },
+ "require": {
+ "ext-json": "*",
+ "litesaml/lightsaml": "^4.0",
+ "php": "^8.0",
+ "socialiteproviders/manager": "^4.4"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "SocialiteProviders\\Saml2\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Chris Lloyd",
+ "email": "[email protected]"
+ }
+ ],
+ "description": "SAML2 Service Provider for Laravel Socialite",
+ "keywords": [
+ "SAML2",
+ "laravel",
+ "oauth",
+ "provider",
+ "socialite"
+ ],
+ "support": {
+ "docs": "https://socialiteproviders.com/saml2",
+ "issues": "https://github.com/socialiteproviders/providers/issues",
+ "source": "https://github.com/socialiteproviders/providers"
+ },
+ "time": "2023-11-07T22:07:12+00:00"
+ },
{
"name": "spatie/backtrace",
"version": "1.6.2",
@@ -14750,6 +14912,6 @@
"ext-xml": "*",
"ext-zlib": "*"
},
- "platform-dev": [],
+ "platform-dev": {},
"plugin-api-version": "2.6.0"
}
librenms@nms:~$
So how can I solve this? I tried to run “./scripts/github-remove -d” or “./scripts/github-remove -s” but the error comes again after a while.