Add functionality to show exceptions

Closes #49

website/admin.php

@@ -1,40 +1,6 @@
 <?PHP
 
- session_start();
-
- $allowedIDs = array(
-	'https://www.google.com/accounts/o8/id?id=AItOawk9b32oBoVvjzwEhvC2GOhsxj0MN2mWoc8', // Me
-	'https://www.google.com/accounts/o8/id?id=AItOawk8LzSeazeZxqMCTVKm-OkUu0mLDLOqBBs', // Simon
-	'https://www.google.com/accounts/o8/id?id=AItOawkM5hzpAq2WOz0DDy3N9PnEtqinHbgNrNI', // Shane
- );
-
- if (isset($_SESSION['openid']['error'])) {
-
-  // Failed OpenID login attempt
-  echo 'ERROR: ',  htmlentities($_SESSION['openid']['error']);
-  unset($_SESSION['openid']['error']);
-  exit;
-
- } else if (isset($_SESSION['openid']['validated']) && $_SESSION['openid']['validated']) {
-
-  if (!in_array($_SESSION['openid']['identity'], $allowedIDs)) {
-   echo 'ERROR: ', htmlentities($_SESSION['openid']['identity']), ' not permitted';
-   exit;
-  }
-
- } else {
-
-  if (!isset($_REQUEST['openid_mode'])) {
-   $_POST['openid_url'] = 'https://www.google.com/accounts/o8/id';
-  }
-
-  require('openid/processor.php');
-  exit;
-
- }
-
- # -------------- End of authentication code --------------------------
-
+ require('auth.php');
  require('common.php');
 
  # -------------- Form handling -----------------

website/auth.php

@@ -0,0 +1,39 @@
+<?PHP
+
+ session_start();
+
+ define('OPENID_TRUSTROOT', 'http://chris.smith.name/android/');
+
+ $allowedIDs = array(
+        'https://www.google.com/accounts/o8/id?id=AItOawlVzlhRypZuhvENeUFtVWY_flhmyihDje8', // Me
+        'https://www.google.com/accounts/o8/id?id=AItOawkmbwj0T1NMwv9GVrrY5g3VD5WsiVlWUhc', // Simon
+        'https://www.google.com/accounts/o8/id?id=AItOawkZ2rNlFp4lHowKWFYFiGRYLi51dlrhAzI', // Shane
+ );
+
+ if (isset($_SESSION['openid']['error'])) {
+
+  // Failed OpenID login attempt
+  echo 'ERROR: ',  htmlentities($_SESSION['openid']['error']);
+  unset($_SESSION['openid']['error']);
+  exit;
+
+ } else if (isset($_SESSION['openid']['validated']) && $_SESSION['openid']['validated']) {
+
+  if (!in_array($_SESSION['openid']['identity'], $allowedIDs)) {
+   echo 'ERROR: ', htmlentities($_SESSION['openid']['identity']), ' not permitted';
+   unset($_SESSION['openid']);
+   exit;
+  }
+
+ } else {
+
+  if (!isset($_REQUEST['openid_mode'])) {
+   $_POST['openid_url'] = 'https://www.google.com/accounts/o8/id';
+  }
+
+  require('openid/processor.php');
+  exit;
+
+ }
+
+?>

website/exceptions.php

@@ -0,0 +1,36 @@
+<?PHP
+
+ require('auth.php');
+ require('common.php');
+
+?>
+<h1>Exceptions</h1>
+
+<?PHP
+
+ $sql = 'SELECT ex_application, ex_ip, ex_imei, ex_version, ex_trace FROM exceptions ORDER BY ex_application, ex_version';
+ $res = mysql_query($sql);
+
+ function fix($x) { return str_replace('.', '/', $x[1]); }
+
+ echo '<table border="1">';
+
+ while ($row = mysql_fetch_assoc($res)) {
+
+  echo '<tr><td><table>';
+  foreach ($row as $k => $v) { echo '<tr><th>', $k, '</th><td>', $k == 'ex_trace' ? ($points = count(explode("\n", $v))) . ' line(s)' : nl2br(htmlentities($v)), '</td></tr>'; }
+
+  echo '</table>';
+
+  echo '</td><td><pre>';
+
+  parse_str($row['ex_trace'], $data);
+  echo preg_replace_callback('/__(.*?)__/', 'fix', preg_replace('(at (uk\.co\.md87.*?)(\.[^.]+)\((.*?):([0-9]+)\))', 'at \1\2(<a href="http://github.com/csmith/ContextApi/blob/' . $row['ex_application'] . '/' . $row['ex_version'] . '/code/' . $row['ex_application'] . '/src/__\1__.java#L\4">\3:\4</a>)', htmlentities($data['stacktrace'])));
+
+  echo '</pre></td>';
+  echo '</tr>';
+ }
+
+ echo '</table>';
+
+?>

website/process.php

@@ -4,6 +4,55 @@
 
  define('VERSION', 25);
 
+ function processExceptions($records = true) {
+  $sql = 'SELECT record_id, record_ip, record_headers, record_data FROM unprocessed';
+  $res = mysql_query($sql);
+  $count = 0;
+
+  while ($row = mysql_fetch_assoc($res)) {
+   $ip = $row['record_ip'];
+
+   $headers = array();
+
+   foreach (explode("\n", $row['record_headers']) as $line) {
+    if (preg_match('/(.*?): (.*)$/', $line, $m)) {
+     $headers[$m[1]] = $m[2];
+    }
+   }
+
+   if (!isset($headers['APPLICATION']) || substr($headers['APPLICATION'], -10) != '-exception') {
+    continue;
+   }
+
+   $application = substr($headers['APPLICATION'], 0, -10);
+   $imei = isset($headers['IMEI']) ? $headers['IMEI'] : '';
+
+   if (!ctype_digit($imei) && !empty($imei)) {
+    // It's probably an MEID not an IMEI number
+    $imei = bchexdec($headers['IMEI']);
+   }
+
+   $version = isset($headers['VERSION']) ? $headers['VERSION'] : '';
+   $headers = $row['record_headers'];
+   $data = $row['record_data'];
+
+   $sql  = 'INSERT INTO exceptions (ex_ip, ex_imei, ex_application, ex_version, ';
+   $sql .= 'ex_headers, ex_trace) VALUES (';
+   $sql .= '\'' . m($ip) . '\', \'' . m($imei) . '\', \'' . m($application) . '\', \'';
+   $sql .= m($version) . '\', \'' . m($headers) . '\', \'' . m($data) . '\')';
+   mysql_query($sql) or die(mysql_error());
+
+   $sql  = 'DELETE FROM unprocessed WHERE record_id = ' . $row['record_id'];
+   mysql_query($sql);
+
+   $count++;
+  }
+
+  if ($count > 1 || !$records && $count > 0) {
+   Oblong("\002[ANDROID]\002 Processed $count " . ($records ? "new" : "existing") . " exceptions");
+  }
+ }
+
  function processSensorLogger($records = true) {
   $sql = $records ? 'SELECT record_id, record_ip, record_headers, record_data FROM unprocessed'
                   : 'SELECT log_id, log_ip AS record_ip, log_headers AS record_headers, log_data '
@@ -133,5 +182,6 @@
  }
 
  processSensorLogger(!isset($argv[1]) || $argv[1] != '--update');
+ processExceptions(!isset($argv[1]) || $argv[1] != '--update');
 
 ?>