Do not enforce Twig on oldui

tvdijen · tvdijen · commit 13ec2fdef3d0 · 2019-08-29T22:39:43.000+02:00
Conflicts:
	lib/IdP/ADFS.php
diff --git a/lib/IdP/ADFS.php b/lib/IdP/ADFS.php
@@ -186,28 +186,30 @@ private static function signResponse($response, $key, $cert, $algo, $passphrase)
     private static function postResponse($url, $wresult, $wctx)
     {
         $config = \SimpleSAML\Configuration::getInstance();
-        $newui = $config->getBoolean('usenewui', false);
-
-        // Remove this in SSP 2.0 when Twig has become the default
-        if ($newui === false) {
-            $config = \SimpleSAML\Configuration::loadFromArray(['usenewui' => true]);
-        }
-
-        $t = new \SimpleSAML\XHTML\Template($config, 'adfs:postResponse.twig');
-        $t->data['baseurlpath'] = \SimpleSAML\Module::getModuleURL('adfs');
-        $t->data['url'] = $url;
-        $t->data['wresult'] = $wresult;
-        $t->data['wctx'] = $wctx;
-
-        // Remove the IF-part in SSP 2.0 when Twig has become the default
-        if ($newui === false) {
-            $twig = $t->getTwig();
-            if (!isset($twig)) {
-                throw new \Exception('Even though we explicitly configure that we want Twig, the Template class does not give us Twig. This is a bug.');
-            }
-            $result = $twig->render('adfs:postResponse.twig', $t->data);
-            echo $result;
+        $usenewui = $config->getBoolean('usenewui', false);
+        if ($usenewui === false) {
+            $wresult = htmlspecialchars($wresult);
+            $wctx = htmlspecialchars($wctx);
+
+            $post = <<<MSG
+    <body onload="document.forms[0].submit()">
+        <form method="post" action="$url">
+            <input type="hidden" name="wa" value="wsignin1.0">
+            <input type="hidden" name="wresult" value="$wresult">
+            <input type="hidden" name="wctx" value="$wctx">
+            <noscript>
+                <input type="submit" value="Continue">
+            </noscript>
+        </form>
+    </body>
+MSG;
+            echo $post;
         } else {
+            $t = new \SimpleSAML\XHTML\Template($config, 'adfs:postResponse.twig');
+            $t->data['baseurlpath'] = \SimpleSAML\Module::getModuleURL('adfs');
+            $t->data['url'] = $url;
+            $t->data['wresult'] = $wresult;
+            $t->data['wctx'] = $wctx;
             $t->show();
         }
     }
