Now less broken

cgi/api.cgi

@@ -15,32 +15,30 @@ sub run {
     # Load up CGI processing modules
     Cpanel::LoadModule::Custom::load_perl_module("Troglodyne::CGI");
 
-    my $ret = {
-        'metadata' => {
-            'input_args' => $args,
-        },
-    };
+    my $ret = { 'metadata' => {} };
 
     # Process the args
-    my $args = {};
+    my $args;
     my $err;
     {
         local $@;
-        $args = eval { Troglodyne::CGI::get_args() };
+        eval { $args = Troglodyne::CGI::get_args() };
         $err = $@;
     }
 
-    if(!scalar(keys(%$args))) {
+    if(!$args || !scalar(keys(%$args))) {
         $ret->{'result'} = 0;
         $ret->{'error'} = "No args detected! $err";
         return emit($ret);
     }
+    $err = '';
+    $ret->{'metadata'}{'input_args'} = $args;
 
     # XXX Validation plz
 
     # Load route code
     my $namespace = "Troglodyne::API::$args->{'module'}";
-    my ( $loaded, $err, $coderef );
+    my ( $loaded, $coderef );
     {
         local $@;
         $loaded = eval {

js/pgupgrade.js

@@ -1,32 +1,37 @@
-function doAPIRequestWithCallback (mod, func, handler, errorHandler, args) {
+function doAPIRequestWithCallback (meth, mod, func, handler, errorHandler, args) {
     'use strict';
     let oReq = new XMLHttpRequest();
     oReq.onreadystatechange = function() {
         if (this.readyState === XMLHttpRequest.DONE) {
             if( this.status === 200 ) {
-                handler(this);
+                handler(this.responseText);
             } else {
-                errorHandler(mod, func, this.status, this.responseText);
+                errorHandler(meth, mod, func, this.status, this.responseText);
             }
         }
     }
-    oReq.addEventListener("load", handler);
-    let argarr = [];
+    let argarr = [ `module=${mod}`, `function=${func}` ];
     if( typeof args === 'Object' ) {
         Object.keys(args).forEach( function(argument) {
             argarr.push(`${argument}=${args[argument]}`);
         });
     }
+    let argstr = argarr.join("&");
 
-    oReq.open( "POST", "api.cgi", true );
-    oReq.setRequestHeader( "Content-type", "application/x-www-form-urlencoded" );
-    oReq.send(argarr.join("&"));
+    if( meth === 'GET' ) {
+        oReq.open( meth, `api.cgi?${argstr}`, true );
+        oReq.send();
+    } else if ( meth === 'POST' ) {
+        oReq.open( meth, "api.cgi", true );
+        oReq.setRequestHeader( "Content-type", "application/x-www-form-urlencoded" );
+        oReq.send();
+    }
     return false;
 }
 
-function generalErrorHandler(mod, func, code, txt) {
+function generalErrorHandler(meth, mod, func, code, txt) {
     console.log(txt);
-    alert(`API call to ${mod}::${func} failed with error code ${code}! Please see the JS console for details.`);
+    alert(`${meth} call to Troglodyne::API::${mod}::${func} failed with error code ${code}! Please see the JS console for details.`);
     return false;
 }
 
@@ -41,11 +46,10 @@ function safeParseJSON(txt) {
     return obj;
 }
 
-function versionHandler (xhr) {
+function versionHandler (resp) {
     'use strict';
-    let obj = safeParseJSON(xhr.responseText);
+    let obj = safeParseJSON(resp);
     if(obj.result === 1) {
-        console.log(obj);
 
         // Construct version warning/display
         let pgVersion = obj.data.installed_version.major + '.' + obj.data.installed_version.minor;
@@ -56,8 +60,6 @@ function versionHandler (xhr) {
             html += ' -- You are using a version of PostgreSQL Server that is no longer supported by ';
             html += '<a href="https://www.postgresql.org/support/versioning/" title="PostgreSQL Supported versions page">postgresql.org</a>!<br>';
             if( obj.data.eol_versions.hasOwnProperty(pgVersion) ) {
-                console.log(obj.data.eol_versions[pgVersion]);
-                console.log(obj.data.eol_versions[pgVersion].EOL);
                 html += "<strong>EOL</strong> -- " + new Date(obj.data.eol_versions[pgVersion].EOL * 1000).toLocaleString( undefined, { year: 'numeric', month: 'long', day: 'numeric' } ) + "<br>";
             }
             html += "<strong>Immediate upgrade is recommended.</strong>";
@@ -93,9 +95,9 @@ function versionHandler (xhr) {
     }
 }
 
-function doInstallScroller (xhr) {
+function doInstallScroller (resp) {
     'use strict';
-    let obj = JSON.parse(xhr.responseText);
+    let obj = JSON.parse(resp);
     let upgradeWell = document.getElementById('upgradeWell');
     let submitBtn = document.getElementById('submit');
     if(obj.result === 1) {
@@ -112,7 +114,7 @@ function doInstallScroller (xhr) {
         }
         // Ok, now kick off actual install TODO use WebSocket?
         upgradeWell.textContent += "\nNow proceeding with install of PostgreSQL " + window.selectedVersion + "...\n";
-        doAPIRequestWithCallback( 'Postgres', 'start_postgres_install', handlePGInstall, generalErrorHandler, { "version": window.selectedVersion } );
+        doAPIRequestWithCallback( 'POST', 'Postgres', 'start_postgres_install', handlePGInstall, generalErrorHandler, { "version": window.selectedVersion } );
     } else {
          upgradeWell.textContent += "Installlation of community repositories failed:" + obj.reason;
          submitBtn.textContent = 'Re-Try';
@@ -121,9 +123,9 @@ function doInstallScroller (xhr) {
     return false;
 }
 
-function handlePGInstall (xhr) {
+function handlePGInstall (resp) {
     'use strict';
-    let obj = safeParseJSON(xhr.responseText);
+    let obj = safeParseJSON(resp);
     if(obj.result === 1) {
         console.log(obj);
         console.log("OK. Now doing our install.");
@@ -143,11 +145,11 @@ window.doUpgrade = function () {
     submitBtn.disabled = true;
     submitBtn.innerHTML = '<span class="fa fa-spin fa-spinner"></span>';
     document.getElementById('upgradeDiv').innerHTML = '<pre id="upgradeWell" class="well">Ensuring that the PostgreSQL Community repository is installed...\n</pre>';
-    doAPIRequestWithCallback('Postgres', 'enable_community_repositories', doInstallScroller, generalErrorHandler );
+    doAPIRequestWithCallback( 'GET', 'Postgres', 'enable_community_repositories', doInstallScroller, generalErrorHandler );
 
     return false;
 }
 
 // Now kickoff the page load post bits
 document.getElementById('submit').disabled = true;
-doAPIRequestWithCallback( 'Postgres', 'get_postgresql_versions', versionHandler, generalErrorHandler );
+doAPIRequestWithCallback( 'GET', 'Postgres', 'get_postgresql_versions', versionHandler, generalErrorHandler );

lib/Troglodyne/API/Postgres.pm

@@ -5,7 +5,7 @@ use warnings;
 
 use Cpanel::LoadModule::Custom;
 
-our $dir = '/var/cpanel/logs/troglodyne/pgupgrade'
+our $dir = '/var/cpanel/logs/troglodyne/pgupgrade';
 
 sub get_postgresql_versions {
     Cpanel::LoadModule::Custom::load_perl_module('Troglodyne::CpPostgreSQL');
@@ -35,7 +35,7 @@ sub enable_community_repositories {
     });
     my $installed = !$ret;
     if( !$installed ) {
-        @cmd = qw{/bin/rpm -i}, $repo_rpm_url;
+        @cmd = ( qw{/bin/rpm -i}, $repo_rpm_url );
         ( $stdout, $stderr, $ret ) = Capture::Tiny::capture( sub {
             system(@cmd);
         } );
@@ -52,7 +52,6 @@ sub enable_community_repositories {
 sub start_postgres_install {
     my ( $args_hr ) = @_;
     my $version = $args_hr->{'version'};
-    my $dir = '/var/cpanel/logs/troglodyne/pgupgrade'
     require Cpanel::Mkdir;
     Cpanel::Mkdir::ensure_directory_existence_and_mode( $dir, 0711 );
 

lib/Troglodyne/CGI.pm

@@ -5,12 +5,14 @@ use warnings;
 
 # Need to also get POST args, etc.
 sub get_args {
-    require Data::Dumper;
-    die Data::Dumper::Dumper(%$ENV);
-    my $request_method = $ENV{'REQUEST_METHOD'};
-    die "Unsupported request method: '$request_method'" if !grep{ $request_method eq $_ } qw{GET POST};
-    die "POST UNIMPLEMENTED" if $request_method eq 'POST';
-    my $args_hr = { map { split( /=/, $_ ) } split( /&/, $ENV{'QUERY_STRING'} ) };
+    my $meth = $ENV{'REQUEST_METHOD'};
+    die "Unsupported request method: '$meth'" if !grep{ $meth eq $_ } qw{GET POST};
+    my $args_hr = {};
+    my %handlers = (
+        'GET'  => sub { return { map { split( /=/, $_ ) } split( /&/, $ENV{'QUERY_STRING'} ) } },
+        'POST' => sub { die "UNIMPLEMENTED!" },
+    );
+    $args_hr = $handlers{$meth}->();
     return $args_hr;
 }