toolforge.org fixes

* New homepage in composer.json
* Redirect oge/status to sge-jobs.toolforge.org
* Process records from Hay's that are using toolforge.org URLs
* Connect to host admin.toolforge.org to find active dynamic proxy

Author: bd808

composer.json

@@ -1,7 +1,7 @@
 {
 	"name": "tools/admin",
 	"license": "GPL-3.0+",
-	"homepage": "https://tools.wmflabs.org/",
+	"homepage": "https://toolforge.org/",
 	"require": {
 		"ext-redis": ">=2.0",
 		"ezyang/htmlpurifier": "~4.7",

src/App.php

@@ -53,9 +53,6 @@ protected function configureSlim( \Slim\Slim $slim ) {
 			'toolinfo.uri' => Config::getStr( 'TOOLINFO_URI',
 				'https://hay.toolforge.org/directory/api.php'
 			),
-			'tools.base' => Config::getStr( 'TOOLS_BASE',
-				'https://tools.wmflabs.org/'
-			),
 		] );
 
 		$slim->configureMode( 'production', function () use ( $slim ) {
@@ -120,8 +117,6 @@ protected function configureIoc( \Slim\Helper\Set $container ) {
 		$container->singleton( 'purifierConfig', function ( $c ) {
 			$config = \HTMLPurifier_Config::createDefault();
 			$config->set( 'HTML.Doctype', 'HTML 4.01 Transitional' );
-			$config->set( 'URI.Base', 'https://tools.wmflabs.org' );
-			$config->set( 'URI.MakeAbsolute', true );
 			$config->set( 'URI.DisableExternalResources', true );
 			// Strip all css
 			$config->set( 'HTML.ForbiddenAttributes', [ '*@style' ] );
@@ -290,8 +285,8 @@ function () use ( $slim ) {
 
 				$slim->get( 'oge/status', function () use ( $slim ) {
 					$page = new Pages\Redirect( $slim );
-					$page->setBaseUrl( $slim->config( 'tools.base' ) );
-					$page( 'sge-jobs/' );
+					$page->setBaseUrl( 'https://sge-jobs.toolforge.org' );
+					$page( '/' );
 				} )->name( 'oge-status' );
 			}
 		); // end group '/'

src/Toolinfo.php

@@ -108,6 +108,25 @@ private function filterToolinfo( $raw ) {
 					'author' => static::aGet( 'author', $info ),
 					'repository' => static::aGet( 'repository', $info ),
 				];
+			} elseif ( false !== strpos( $info['url'], 'toolforge.org' ) ) {
+				preg_match(
+					'#^(https?:)?//([^.]+).toolforge.org/.*#',
+					$info['url'],
+					$m
+				);
+				$tool = $m[2];
+				if ( !array_key_exists( $tool, $toolinfo ) ) {
+					$toolinfo[$tool] = [];
+				}
+				$toolinfo[$tool][] = [
+					'name' => $info['name'],
+					'title' => $info['title'],
+					'description' => $info['description'],
+					'url' => $info['url'],
+					'keywords' => static::aGet( 'keywords', $info ),
+					'author' => static::aGet( 'author', $info ),
+					'repository' => static::aGet( 'repository', $info ),
+				];
 			}
 		}
 		return $toolinfo;

src/Tools.php

@@ -103,7 +103,7 @@ public function getActiveWebservices() {
 			// containers.
 			// $active_proxy = file_get_contents( '/etc/active-proxy' );
 			// Split horizon DNS should take us where we need to go
-			$active_proxy = 'tools.wmflabs.org';
+			$active_proxy = 'admin.toolforge.org';
 			$proxy_uri = "http://{$active_proxy}:8081/list";
 			$client = new Client();
 			$response = $client->get( $proxy_uri );