Merge pull request #3 from Kwbmm/feat/auth-from-env

Implement authentication from env
RSS-Bridge · Apr 23, 2021 · 4c26918 · 4c26918
2 parents 3303dc6 + 13d4315
commit 4c26918
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/fork_sync.yml b/.github/workflows/fork_sync.yml
@@ -10,9 +10,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: tgymnich/fork-sync@v1.4
+      - uses: tgymnich/fork-sync@v1.3
         with:
-          token: ${{ secrets.AUTO_APPROVE }}
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          personal_token: ${{ secrets.AUTO_APPROVE }}
           owner: RSS-Bridge
           base: master
           head: master

diff --git a/lib/Authentication.php b/lib/Authentication.php
@@ -64,15 +64,21 @@ public static function showPromptIfNeeded() {
 
 	/**
 	 * Verifies if an authentication request was received and compares the
-	 * provided username and password to the configuration of RSS-Bridge
-	 * (`[authentication] username` and `[authentication] password`).
+	 * provided username and password either to the configuration of RSS-Bridge
+	 * (`[authentication] username` and `[authentication] password`) or to
+	 * 'AUTH_USER' and 'AUTH_PSW' environment variables if 'from_env' is set.
 	 *
 	 * @return bool True if authentication succeeded.
 	 */
 	public static function verifyPrompt() {
-
 		if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
-			if(Configuration::getConfig('authentication', 'username') === $_SERVER['PHP_AUTH_USER']
+			if(Configuration::getConfing( 'authentication', 'from_env' )) {
+				if(getenv('AUTH_USER') === $_SERVER['PHP_AUTH_USER'] && getenv('AUTH_PSW') === $_SERVER['PHP_AUTH_PW']) {
+					return true;
+				} else {
+					error_log('[RSS-Bridge] Failed authentication attempt from ' . $_SERVER['REMOTE_ADDR']);
+				}
+			} elseif(Configuration::getConfig( 'authentication', 'username') === $_SERVER['PHP_AUTH_USER']
 				&& Configuration::getConfig('authentication', 'password') === $_SERVER['PHP_AUTH_PW']) {
 				return true;
 			} else {