Skip to content

GitLab

Commit d5e06d90 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Change styling for error pages to APT styling.

parent 1c60fed9
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 32 deletions
www/aptui/js/null.js 0 → 100644
View file @ d5e06d90
window.APT_OPTIONS.config();
require(['jquery', 'js/quickvm_sup',
// jQuery modules
'bootstrap'],
function ($, sup)
{
'use strict';
function initialize()
{
window.APT_OPTIONS.initialize(sup);
}
$(document).ready(initialize);
});
www/aptui/quickvm_sup.php
View file @ d5e06d90
......@@ -44,6 +44,17 @@ if ($TBMAINSITE && $_SERVER["SERVER_NAME"] == "www.aptlab.net") {
$APTBASE = "https://www.aptlab.net";
}
#
# Redefine this so APT errors are styled properly.
#
$PAGEERROR_HANDLER = function($msg, $status_code = 0) {
SPITHEADER();
echo $msg;
echo "<script src='js/lib/require.js' data-main='js/null.js'></script>\n";
SPITFOOTER();
die("");
};
function SPITHEADER($thinheader = 0)
{
global $TBMAINSITE;
......
www/menu.php3
View file @ d5e06d90
<?php
#
# Copyright (c) 2000-2013 University of Utah and the Flux Group.
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -1331,7 +1331,10 @@ define("HTTP_400_BAD_REQUEST", 400);
define("HTTP_403_FORBIDDEN", 403);
define("HTTP_404_NOT_FOUND", 404);
function PAGEERROR($msg, $status_code = 0) {
#
# Use a function pointer so we can redefine it in the APT module.
#
$PAGEERROR_HANDLER = function($msg, $status_code = 0) {
global $drewheader, $noheaders;
if (! $drewheader && $status_code != 0)
......@@ -1346,6 +1349,13 @@ function PAGEERROR($msg, $status_code = 0) {
if (! $noheaders)
PAGEFOOTER();
die("");
};
function PAGEERROR($msg, $status_code = 0) {
global $PAGEERROR_HANDLER;
$PAGEERROR_HANDLER($msg, $status_code);
}
#
......
www/url_defs.php
View file @ d5e06d90
......@@ -391,7 +391,7 @@ function VerifyPageArguments($argspec, $required)
$idx = $_REQUEST[URL_EXPERIMENT];
$yep = 1;
if (ValidateArgument(PAGEARG_EXPERIMENT, $idx)) {
if (ValidateArgument($name, PAGEARG_EXPERIMENT, $idx)) {
$object = Experiment::Lookup($idx);
}
}
......@@ -399,7 +399,7 @@ function VerifyPageArguments($argspec, $required)
$idx = $_REQUEST[URL_EXPTIDX];
$yep = 1;
if (ValidateArgument(PAGEARG_EXPERIMENT, $idx)) {
if (ValidateArgument($name, PAGEARG_EXPERIMENT, $idx)) {
$object = Experiment::Lookup($idx);
}
}
......@@ -409,8 +409,8 @@ function VerifyPageArguments($argspec, $required)
$eid = $_REQUEST[URL_EID];
$yep = 1;
if (ValidateArgument(PAGEARG_PID, $pid) &&
ValidateArgument(PAGEARG_EID, $eid)) {
if (ValidateArgument($name, PAGEARG_PID, $pid) &&
ValidateArgument($name, PAGEARG_EID, $eid)) {
$object = Experiment::LookupByPidEid($pid, $eid);
}
}
......@@ -423,8 +423,8 @@ function VerifyPageArguments($argspec, $required)
$vers = $_REQUEST[URL_VERS];
$yep = 1;
if (ValidateArgument(PAGEARG_GUID, $guid) &&
ValidateArgument(PAGEARG_VERS, $vers)) {
if (ValidateArgument($name, PAGEARG_GUID, $guid) &&
ValidateArgument($name, PAGEARG_VERS, $vers)) {
$object = Template::Lookup($guid, $vers);
}
}
......@@ -448,7 +448,7 @@ function VerifyPageArguments($argspec, $required)
$idx = $_REQUEST[URL_INSTANCE];
$yep = 1;
if (ValidateArgument(PAGEARG_INSTANCE, $idx)) {
if (ValidateArgument($name, PAGEARG_INSTANCE, $idx)) {
$object = TemplateInstance::LookupByExptidx($idx);
}
}
......@@ -475,7 +475,7 @@ function VerifyPageArguments($argspec, $required)
$idx = $_REQUEST[URL_PROJECT];
$yep = 1;
if (ValidateArgument(PAGEARG_PROJECT, $idx)) {
if (ValidateArgument($name, PAGEARG_PROJECT, $idx)) {
$object = Project::Lookup($idx);
}
}
......@@ -483,7 +483,7 @@ function VerifyPageArguments($argspec, $required)
$pid = $_REQUEST[URL_PID];
$yep = 1;
if (ValidateArgument(PAGEARG_PID, $pid)) {
if (ValidateArgument($name, PAGEARG_PID, $pid)) {
$object = Project::Lookup($pid);
}
}
......@@ -494,7 +494,7 @@ function VerifyPageArguments($argspec, $required)
$idx = $_REQUEST[URL_GROUP];
$yep = 1;
if (ValidateArgument(PAGEARG_GROUP, $idx)) {
if (ValidateArgument($name, PAGEARG_GROUP, $idx)) {
$object = Group::Lookup($idx);
}
}
......@@ -504,8 +504,8 @@ function VerifyPageArguments($argspec, $required)
$gid = $_REQUEST[URL_GID];
$yep = 1;
if (ValidateArgument(PAGEARG_PID, $pid) &&
ValidateArgument(PAGEARG_GID, $gid)) {
if (ValidateArgument($name, PAGEARG_PID, $pid) &&
ValidateArgument($name, PAGEARG_GID, $gid)) {
$object = Group::LookupByPidGid($pid, $gid);
}
}
......@@ -516,7 +516,7 @@ function VerifyPageArguments($argspec, $required)
$idx = $_REQUEST[URL_NODE];
$yep = 1;
if (ValidateArgument(PAGEARG_NODE, $idx)) {
if (ValidateArgument($name, PAGEARG_NODE, $idx)) {
$object = Node::Lookup($idx);
}
}
......@@ -524,7 +524,7 @@ function VerifyPageArguments($argspec, $required)
$nodeid = $_REQUEST[URL_NODEID];
$yep = 1;
if (ValidateArgument(PAGEARG_NODEID, $nodeid)) {
if (ValidateArgument($name, PAGEARG_NODEID, $nodeid)) {
$object = Node::Lookup($nodeid);
}
}
......@@ -532,7 +532,7 @@ function VerifyPageArguments($argspec, $required)
$nodeid = $_REQUEST[URL_NODEID_ALT];
$yep = 1;
if (ValidateArgument(PAGEARG_NODEID, $nodeid)) {
if (ValidateArgument($name, PAGEARG_NODEID, $nodeid)) {
$object = Node::Lookup($nodeid);
}
}
......@@ -543,7 +543,7 @@ function VerifyPageArguments($argspec, $required)
$idx = $_REQUEST[URL_USER];
$yep = 1;
if (ValidateArgument(PAGEARG_USER, $idx)) {
if (ValidateArgument($name, PAGEARG_USER, $idx)) {
$object = User::Lookup($idx);
}
}
......@@ -551,7 +551,7 @@ function VerifyPageArguments($argspec, $required)
$uid = $_REQUEST[URL_UID];
$yep = 1;
if (ValidateArgument(PAGEARG_UID, $uid)) {
if (ValidateArgument($name, PAGEARG_UID, $uid)) {
$object = User::Lookup($uid);
}
}
......@@ -562,7 +562,7 @@ function VerifyPageArguments($argspec, $required)
$imageid = $_REQUEST[URL_IMAGEID];
$yep = 1;
if (ValidateArgument(PAGEARG_IMAGE, $imageid)) {
if (ValidateArgument($name, PAGEARG_IMAGE, $imageid)) {
$object = Image::Lookup($imageid);
}
}
......@@ -570,7 +570,7 @@ function VerifyPageArguments($argspec, $required)
$imageid = $_REQUEST[$name];
$yep = 1;
if (ValidateArgument(PAGEARG_IMAGE, $imageid)) {
if (ValidateArgument($name, PAGEARG_IMAGE, $imageid)) {
$object = Image::Lookup($imageid);
}
}
......@@ -581,7 +581,7 @@ function VerifyPageArguments($argspec, $required)
$osid = $_REQUEST[URL_OSID];
$yep = 1;
if (ValidateArgument(PAGEARG_OSINFO, $osid)) {
if (ValidateArgument($name, PAGEARG_OSINFO, $osid)) {
$object = OSinfo::Lookup($osid);
}
}
......@@ -614,7 +614,7 @@ function VerifyPageArguments($argspec, $required)
$object = $_REQUEST[$name];
$yep = 1;
if (! ValidateArgument($type, $object)) {
if (! ValidateArgument($name, $type, $object)) {
unset($object);
}
}
......@@ -673,7 +673,7 @@ function VerifyPageArguments($argspec, $required)
$logid = $_REQUEST[URL_LOGFILE];
$yep = 1;
if (ValidateArgument(PAGEARG_LOGFILE, $logid)) {
if (ValidateArgument($name, PAGEARG_LOGFILE, $logid)) {
$object = Logfile::Lookup($logid);
}
}
......@@ -705,9 +705,9 @@ function VerifyPageArguments($argspec, $required)
#
# Validate a single argument is safe to pass along to a DB query.
#
function ValidateArgument($name, $arg)
function ValidateArgument($name, $type, $arg)
{
switch ($name) {
switch ($type) {
case PAGEARG_UID:
case PAGEARG_PID:
case PAGEARG_GID:
......@@ -722,7 +722,6 @@ function ValidateArgument($name, $arg)
if (preg_match("/^[-\w]+$/", "$arg")) {
return 1;
}
PAGEARGERROR("Invalid argument for '$name': $arg");
break;
case PAGEARG_IMAGEID:
......@@ -732,7 +731,6 @@ function ValidateArgument($name, $arg)
if (preg_match("/^[-\w\.\+]+$/", "$arg")) {
return 1;
}
PAGEARGERROR("Invalid argument for '$name': $arg");
break;
case PAGEARG_GUID:
......@@ -741,14 +739,12 @@ function ValidateArgument($name, $arg)
if (preg_match("/^[\d]+$/", "$arg")) {
return 1;
}
PAGEARGERROR("Invalid argument for '$name': $arg");
break;
case PAGEARG_METADATA:
if (preg_match("/^[\d]+\/[\d]+$/", "$arg")) {
return 1;
}
PAGEARGERROR("Invalid argument for '$name': $arg");
break;
case PAGEARG_INTEGER:
......@@ -756,20 +752,19 @@ function ValidateArgument($name, $arg)
if (is_numeric($arg)) {
return 1;
}
PAGEARGERROR("Invalid argument for '$name': $arg");
break;
case PAGEARG_ARRAY:
if (is_array($arg)) {
return 1;
}
PAGEARGERROR("'$name' is not an array: $arg");
break;
default:
TBERROR("ValidateArgument: ".
"Unknown argument type - $name", 1);
}
PAGEARGERROR("Argument '$name' should be of type '$type'");
return 0;
}
?>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment