Import: support "Authorization" header as well

This is used (for example) by pretalx to access the schedule if it is set to not be available publicly. This fixes crs-tools#255
Kunsi · Oct 19, 2024 · 244893d · 244893d
1 parent a1757f5
commit 244893d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/Application/Controller/Import.php b/src/Application/Controller/Import.php
@@ -454,10 +454,16 @@ private static function _getXML(array $import) {
 							(isset($import['auth_password']))? $import['auth_password'] : ''
 						);
 						break;
-					case 'header':
+					case 'header_authentication':
 						$client->addHeader(
 							'Authentication',
-							(isset($import['auth_header']))? $import['auth_header'] : ''
+							(isset($import['auth_header_authentication']))? $import['auth_header_authentication'] : ''
+						);
+						break;
+					case 'header_authorization':
+						$client->addHeader(
+							'Authorization',
+							(isset($import['auth_header_authorization']))? $import['auth_header_authorization'] : ''
 						);
 						break;
 				}
@@ -515,4 +521,4 @@ private static function _calculateDate(SimpleXMLElement $event, $dayChange) {
 		}
 	}
 
-?>
+?>
diff --git a/src/Application/View/import/index.html.php b/src/Application/View/import/index.html.php
@@ -35,15 +35,17 @@
 					[
 						'' => 'No Authentication',
 						'basic' => 'Basic HTTP Authentication',
-						'header' => 'Authentication Header'
+						'header_authentication' => 'Authentication Header'
+						'header_authorization' => 'Authorization Header'
 					],
 					'',
 					['data-import-auth-type-value']
 				); ?>
 			</li>
 			<li><?= $f->input('auth_user', 'Username', '', ['data-import-auth-type' => 'basic']); ?></li>
 			<li><?= $f->password('auth_password', 'Password', ['data-import-auth-type' => 'basic']); ?></li>
-			<li><?= $f->input('auth_header', 'Authentication Header', '', ['class' => 'wide', 'data-import-auth-type' => 'header']); ?></li>
+			<li><?= $f->input('auth_header_authentication', 'Authentication Header', '', ['class' => 'wide', 'data-import-auth-type' => 'header_authentication']); ?></li>
+			<li><?= $f->input('auth_header_authorization', 'Authorization Header', '', ['class' => 'wide', 'data-import-auth-type' => 'header_authorization']); ?></li>
 			<li><?= $f->submit('Create new import', ['disabled' => $project['read_only']]); ?></li>
 		</ul>
 	</fieldset>