From 2aaa95e6400a1211edf3b4d40a073f59c2c6a2bb Mon Sep 17 00:00:00 2001
From: epriestley <epriestley@phabricator.com>
Date: Mon, 24 Jan 2011 09:00:29 -0800
Subject: [PATCH] Conduit server-side basics.

---
 src/__phutil_library_map__.php                |  21 ++
 ...AphrontDefaultApplicationConfiguration.php |   6 +
 .../api/PhabricatorConduitAPIController.php   | 185 ++++++++++++++++++
 .../conduit/controller/api/__init__.php       |  21 ++
 .../base/PhabricatorConduitController.php     |  46 +++++
 .../conduit/controller/base/__init__.php      |  16 ++
 .../PhabricatorConduitConsoleController.php   | 181 +++++++++++++++++
 .../conduit/controller/console/__init__.php   |  22 +++
 .../log/PhabricatorConduitLogController.php   |  28 +++
 .../conduit/controller/log/__init__.php       |  12 ++
 .../conduit/method/base/ConduitAPIMethod.php  |  62 ++++++
 .../conduit/method/base/__init__.php          |  12 ++
 .../upload/ConduitAPI_file_upload_Method.php  |  54 +++++
 .../conduit/method/file/upload/__init__.php   |  13 ++
 .../protocol/exception/ConduitException.php   |  20 ++
 .../conduit/protocol/exception/__init__.php   |  10 +
 .../protocol/request/ConduitAPIRequest.php    |  35 ++++
 .../conduit/protocol/request/__init__.php     |  10 +
 .../storage/base/PhabricatorConduitDAO.php    |  25 +++
 .../conduit/storage/base/__init__.php         |  12 ++
 .../PhabricatorConduitConnectionLog.php       |  26 +++
 .../storage/connectionlog/__init__.php        |  12 ++
 .../PhabricatorConduitMethodCallLog.php       |  26 +++
 .../storage/methodcalllog/__init__.php        |  12 ++
 src/view/layout/panel/AphrontPanelView.php    |   1 +
 .../layout/sidenav/AphrontSideNavView.php     |  45 +++++
 src/view/layout/sidenav/__init__.php          |  13 ++
 webroot/rsrc/css/base.css                     |  61 ++++++
 28 files changed, 987 insertions(+)
 create mode 100644 src/applications/conduit/controller/api/PhabricatorConduitAPIController.php
 create mode 100644 src/applications/conduit/controller/api/__init__.php
 create mode 100644 src/applications/conduit/controller/base/PhabricatorConduitController.php
 create mode 100644 src/applications/conduit/controller/base/__init__.php
 create mode 100644 src/applications/conduit/controller/console/PhabricatorConduitConsoleController.php
 create mode 100644 src/applications/conduit/controller/console/__init__.php
 create mode 100644 src/applications/conduit/controller/log/PhabricatorConduitLogController.php
 create mode 100644 src/applications/conduit/controller/log/__init__.php
 create mode 100644 src/applications/conduit/method/base/ConduitAPIMethod.php
 create mode 100644 src/applications/conduit/method/base/__init__.php
 create mode 100644 src/applications/conduit/method/file/upload/ConduitAPI_file_upload_Method.php
 create mode 100644 src/applications/conduit/method/file/upload/__init__.php
 create mode 100644 src/applications/conduit/protocol/exception/ConduitException.php
 create mode 100644 src/applications/conduit/protocol/exception/__init__.php
 create mode 100644 src/applications/conduit/protocol/request/ConduitAPIRequest.php
 create mode 100644 src/applications/conduit/protocol/request/__init__.php
 create mode 100644 src/applications/conduit/storage/base/PhabricatorConduitDAO.php
 create mode 100644 src/applications/conduit/storage/base/__init__.php
 create mode 100644 src/applications/conduit/storage/connectionlog/PhabricatorConduitConnectionLog.php
 create mode 100644 src/applications/conduit/storage/connectionlog/__init__.php
 create mode 100644 src/applications/conduit/storage/methodcalllog/PhabricatorConduitMethodCallLog.php
 create mode 100644 src/applications/conduit/storage/methodcalllog/__init__.php
 create mode 100755 src/view/layout/sidenav/AphrontSideNavView.php
 create mode 100644 src/view/layout/sidenav/__init__.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 2cc42fbfc3..044b3158f6 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -40,16 +40,28 @@ phutil_register_library_map(array(
     'AphrontRedirectResponse' => 'aphront/response/redirect',
     'AphrontRequest' => 'aphront/request',
     'AphrontResponse' => 'aphront/response/base',
+    'AphrontSideNavView' => 'view/layout/sidenav',
     'AphrontTableView' => 'view/control/table',
     'AphrontURIMapper' => 'aphront/mapper',
     'AphrontView' => 'view/base',
     'AphrontWebpageResponse' => 'aphront/response/webpage',
+    'ConduitAPIMethod' => 'applications/conduit/method/base',
+    'ConduitAPIRequest' => 'applications/conduit/protocol/request',
+    'ConduitAPI_file_upload_Method' => 'applications/conduit/method/file/upload',
+    'ConduitException' => 'applications/conduit/protocol/exception',
     'DifferentialAction' => 'applications/differential/constants/action',
     'DifferentialChangeType' => 'applications/differential/constants/changetype',
     'DifferentialLintStatus' => 'applications/differential/constants/lintstatus',
     'DifferentialRevisionStatus' => 'applications/differential/constants/revisionstatus',
     'DifferentialUnitStatus' => 'applications/differential/constants/unitstatus',
     'LiskDAO' => 'storage/lisk/dao',
+    'PhabricatorConduitAPIController' => 'applications/conduit/controller/api',
+    'PhabricatorConduitConnectionLog' => 'applications/conduit/storage/connectionlog',
+    'PhabricatorConduitConsoleController' => 'applications/conduit/controller/console',
+    'PhabricatorConduitController' => 'applications/conduit/controller/base',
+    'PhabricatorConduitDAO' => 'applications/conduit/storage/base',
+    'PhabricatorConduitLogController' => 'applications/conduit/controller/log',
+    'PhabricatorConduitMethodCallLog' => 'applications/conduit/storage/methodcalllog',
     'PhabricatorController' => 'applications/base/controller/base',
     'PhabricatorDirectoryCategory' => 'applications/directory/storage/category',
     'PhabricatorDirectoryCategoryDeleteController' => 'applications/directory/controller/categorydelete',
@@ -126,8 +138,17 @@ phutil_register_library_map(array(
     'AphrontQueryParameterException' => 'AphrontQueryException',
     'AphrontQueryRecoverableException' => 'AphrontQueryException',
     'AphrontRedirectResponse' => 'AphrontResponse',
+    'AphrontSideNavView' => 'AphrontView',
     'AphrontTableView' => 'AphrontView',
     'AphrontWebpageResponse' => 'AphrontResponse',
+    'ConduitAPI_file_upload_Method' => 'ConduitAPIMethod',
+    'PhabricatorConduitAPIController' => 'PhabricatorConduitController',
+    'PhabricatorConduitConnectionLog' => 'PhabricatorConduitDAO',
+    'PhabricatorConduitConsoleController' => 'PhabricatorConduitController',
+    'PhabricatorConduitController' => 'PhabricatorController',
+    'PhabricatorConduitDAO' => 'PhabricatorLiskDAO',
+    'PhabricatorConduitLogController' => 'PhabricatorConduitController',
+    'PhabricatorConduitMethodCallLog' => 'PhabricatorConduitDAO',
     'PhabricatorController' => 'AphrontController',
     'PhabricatorDirectoryCategory' => 'PhabricatorDirectoryDAO',
     'PhabricatorDirectoryCategoryDeleteController' => 'PhabricatorDirectoryController',
diff --git a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
index da2ab26f63..bed40f15f5 100644
--- a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
+++ b/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
@@ -69,6 +69,12 @@ class AphrontDefaultApplicationConfiguration
         'edit/(?:(?<username>\w+)/)?$' => 'PhabricatorPeopleEditController',
       ),
       '/p/(?<username>\w+)/$' => 'PhabricatorPeopleProfileController',
+      '/conduit/' => array(
+        '$' => 'PhabricatorConduitConsoleController',
+        'method/(?<method>[^/]+)$' => 'PhabricatorConduitConsoleController',
+        'log/$' => 'PhabricatorConduitLogController',
+      ),
+      '/api/(?<method>[^/]+)$' => 'PhabricatorConduitAPIController',
       '.*' => 'AphrontDefaultApplicationController',
     );
   }
diff --git a/src/applications/conduit/controller/api/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/api/PhabricatorConduitAPIController.php
new file mode 100644
index 0000000000..c259cf4551
--- /dev/null
+++ b/src/applications/conduit/controller/api/PhabricatorConduitAPIController.php
@@ -0,0 +1,185 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class PhabricatorConduitAPIController
+  extends PhabricatorConduitController {
+
+  private $method;
+
+  public function willProcessRequest(array $data) {
+    $this->method = $data['method'];
+    return $this;
+  }
+
+  public function processRequest() {
+    $time_start = microtime(true);
+    $request = $this->getRequest();
+
+    $method = $this->method;
+
+    $method_class = ConduitAPIMethod::getClassNameFromAPIMethodName($method);
+    $api_request = null;
+
+    $log = new PhabricatorConduitMethodCallLog();
+    $log->setMethod($method);
+    $metadata = array();
+
+    try {
+
+      if (!class_exists($method_class)) {
+        throw new Exception(
+          "Unable to load the implementation class for method '{$method}'. ".
+          "You may have misspelled the method, need to define ".
+          "'{$method_class}', or need to run 'arc build'.");
+      }
+
+      // Fake out checkModule, the class has already been autoloaded by the
+      // class_exists() call above.
+      $method_handler = newv($method_class, array());
+
+      if (isset($_REQUEST['params']) && is_array($_REQUEST['params'])) {
+        $params_post = $request->getArr('params');
+        foreach ($params_post as $key => $value) {
+          $params_post[$key] = json_decode($value);
+        }
+        $params = $params_post;
+      } else {
+        $params_json = $request->getStr('params');
+        if (!strlen($params_json)) {
+          $params = array();
+        } else {
+          $params = json_decode($params_json);
+          if (!is_array($params)) {
+            throw new Exception(
+              "Invalid parameter information was passed to method ".
+              "'{$method}', could not decode JSON serialization.");
+          }
+        }
+      }
+
+      $metadata = idx($params, '__conduit__', array());
+      unset($params['__conduit__']);
+
+      $api_request = new ConduitAPIRequest($params);
+
+      try {
+        $result = $method_handler->executeMethod($api_request);
+        $error_code = null;
+        $error_info = null;
+      } catch (ConduitException $ex) {
+        $result = null;
+        $error_code = $ex->getMessage();
+        $error_info = $method_handler->getErrorDescription($error_code);
+      }
+    } catch (Exception $ex) {
+      $result = null;
+      $error_code = 'ERR-CONDUIT-CORE';
+      $error_info = $ex->getMessage();
+    }
+
+    $time_end = microtime(true);
+
+    $connection_id = null;
+    if (idx($metadata, 'connectionID')) {
+      $connection_id = $metadata['connectionID'];
+    } else if (($method == 'conduit.connect') && $result) {
+      $connection_id = idx($result, 'connectionID');
+    }
+
+    $log->setConnectionID($connection_id);
+    $log->setError((string)$error_code);
+    $log->setDuration(1000000 * ($time_end - $time_start));
+    $log->save();
+
+    $result = array(
+      'result'      => $result,
+      'error_code'  => $error_code,
+      'error_info'  => $error_info,
+    );
+
+    switch ($request->getStr('output')) {
+      case 'human':
+        return $this->buildHumanReadableResponse(
+          $method,
+          $api_request,
+          $result);
+      case 'json':
+      default:
+        return id(new AphrontFileResponse())
+          ->setMimeType('application/json')
+          ->setContent(json_encode($result));
+    }
+  }
+
+  private function buildHumanReadableResponse(
+    $method,
+    ConduitAPIRequest $request = null,
+    $result = null) {
+
+    $param_rows = array();
+    $param_rows[] = array('Method', phutil_escape_html($method));
+    if ($request) {
+      foreach ($request->getAllParameters() as $key => $value) {
+        $param_rows[] = array(
+          phutil_escape_html($key),
+          phutil_escape_html(json_encode($value)),
+        );
+      }
+    }
+
+    $param_table = new AphrontTableView($param_rows);
+    $param_table->setColumnClasses(
+      array(
+        'header',
+        'wide',
+      ));
+
+    $result_rows = array();
+    foreach ($result as $key => $value) {
+      $result_rows[] = array(
+        phutil_escape_html($key),
+        phutil_escape_html(json_encode($value)),
+      );
+    }
+
+    $result_table = new AphrontTableView($result_rows);
+    $result_table->setColumnClasses(
+      array(
+        'header',
+        'wide',
+      ));
+
+    $param_panel = new AphrontPanelView();
+    $param_panel->setHeader('Method Parameters');
+    $param_panel->appendChild($param_table);
+
+    $result_panel = new AphrontPanelView();
+    $result_panel->setHeader('Method Result');
+    $result_panel->appendChild($result_table);
+
+    return $this->buildStandardPageResponse(
+      array(
+        $param_panel,
+        $result_panel,
+      ),
+      array(
+        'title' => 'Method Call Result',
+      ));
+  }
+
+}
diff --git a/src/applications/conduit/controller/api/__init__.php b/src/applications/conduit/controller/api/__init__.php
new file mode 100644
index 0000000000..1e6db7a2be
--- /dev/null
+++ b/src/applications/conduit/controller/api/__init__.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'aphront/response/file');
+phutil_require_module('phabricator', 'applications/conduit/controller/base');
+phutil_require_module('phabricator', 'applications/conduit/method/base');
+phutil_require_module('phabricator', 'applications/conduit/protocol/request');
+phutil_require_module('phabricator', 'applications/conduit/storage/methodcalllog');
+phutil_require_module('phabricator', 'view/control/table');
+phutil_require_module('phabricator', 'view/layout/panel');
+
+phutil_require_module('phutil', 'markup');
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorConduitAPIController.php');
diff --git a/src/applications/conduit/controller/base/PhabricatorConduitController.php b/src/applications/conduit/controller/base/PhabricatorConduitController.php
new file mode 100644
index 0000000000..48f75e5c5e
--- /dev/null
+++ b/src/applications/conduit/controller/base/PhabricatorConduitController.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+abstract class PhabricatorConduitController extends PhabricatorController {
+
+  public function buildStandardPageResponse($view, array $data) {
+    $page = new PhabricatorStandardPageView();
+
+    $page->setApplicationName('Conduit');
+    $page->setBaseURI('/conduit/');
+    $page->setTitle(idx($data, 'title'));
+    $page->setTabs(
+      array(
+        'console' => array(
+          'href' => '/conduit/',
+          'name' => 'Console',
+        ),
+        'logs' => array(
+          'href' => '/conduit/log/',
+          'name' => 'Logs',
+        ),
+      ),
+      idx($data, 'tab'));
+    $page->setGlyph("\xE2\x87\xB5");
+    $page->appendChild($view);
+
+    $response = new AphrontWebpageResponse();
+    return $response->setContent($page->render());
+  }
+
+}
diff --git a/src/applications/conduit/controller/base/__init__.php b/src/applications/conduit/controller/base/__init__.php
new file mode 100644
index 0000000000..6dd4aa3801
--- /dev/null
+++ b/src/applications/conduit/controller/base/__init__.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'aphront/response/webpage');
+phutil_require_module('phabricator', 'applications/base/controller/base');
+phutil_require_module('phabricator', 'view/page/standard');
+
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorConduitController.php');
diff --git a/src/applications/conduit/controller/console/PhabricatorConduitConsoleController.php b/src/applications/conduit/controller/console/PhabricatorConduitConsoleController.php
new file mode 100644
index 0000000000..8af6ac3b6f
--- /dev/null
+++ b/src/applications/conduit/controller/console/PhabricatorConduitConsoleController.php
@@ -0,0 +1,181 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class PhabricatorConduitConsoleController
+  extends PhabricatorConduitController {
+
+  private $method;
+
+  public function willProcessRequest(array $data) {
+    $this->method = idx($data, 'method');
+  }
+
+  public function processRequest() {
+    $methods = $this->getAllMethods();
+    if (empty($methods[$this->method])) {
+      $this->method = key($methods);
+    }
+
+    $method_class = $methods[$this->method];
+    PhutilSymbolLoader::loadClass($method_class);
+    $method_object = newv($method_class, array());
+
+
+    $error_description = array();
+    $error_types = $method_object->defineErrorTypes();
+    if ($error_types) {
+      $error_description[] = '<ul>';
+      foreach ($error_types as $error => $meaning) {
+        $error_description[] =
+          '<li>'.
+            '<strong>'.phutil_escape_html($error).':</strong> '.
+            phutil_escape_html($meaning).
+          '</li>';
+      }
+      $error_description[] = '</ul>';
+      $error_description = implode("\n", $error_description);
+    } else {
+      $error_description = "This method does not raise any specific errors.";
+    }
+
+    $form = new AphrontFormView();
+    $form
+      ->setAction('/api/'.$this->method)
+      ->appendChild(
+        id(new AphrontFormStaticControl())
+          ->setLabel('Description')
+          ->setValue(
+            phutil_escape_html($method_object->getMethodDescription())))
+      ->appendChild(
+        id(new AphrontFormStaticControl())
+          ->setLabel('Returns')
+          ->setValue(
+            phutil_escape_html($method_object->defineReturnType())))
+      ->appendChild(
+        id(new AphrontFormStaticControl())
+          ->setLabel('Errors')
+          ->setValue($error_description))
+      ->appendChild(
+        '<p class="aphront-form-instructions">Enter parameters using '.
+        '<strong>JSON</strong>. For instance, to enter a list, type: '.
+        '<tt>["apple", "banana", "cherry"]</tt>');
+
+    $params = $method_object->defineParamTypes();
+    foreach ($params as $param => $desc) {
+      $form->appendChild(
+        id(new AphrontFormTextControl())
+          ->setLabel($param)
+          ->setName("params[{$param}]")
+          ->setCaption($desc));
+    }
+
+    $form
+      ->appendChild(
+        id(new AphrontFormSelectControl())
+          ->setLabel('Output Format')
+          ->setName('output')
+          ->setOptions(
+            array(
+              'human' => 'Human Readable',
+              'json'  => 'JSON',
+            )))
+      ->appendChild(
+        id(new AphrontFormSubmitControl())
+          ->setValue('Call Method'));
+
+    $panel = new AphrontPanelView();
+    $panel->setHeader('Conduit API: '.phutil_escape_html($this->method));
+    $panel->appendChild($form);
+    $panel->setWidth(AphrontPanelView::WIDTH_WIDE);
+
+    $view = new AphrontSideNavView();
+    foreach ($this->buildNavItems() as $item) {
+      $view->addNavItem($item);
+    }
+
+    $view->appendChild($panel);
+
+    return $this->buildStandardPageResponse(
+      array($view),
+      array(
+        'title' => 'Conduit Console',
+        'tab'   => 'console',
+      ));
+  }
+
+  private function buildNavItems() {
+    $classes = $this->getAllMethodImplementationClasses();
+    $method_names = array();
+    foreach ($classes as $method_class) {
+      $method_name = ConduitAPIMethod::getAPIMethodNameFromClassName(
+        $method_class);
+      $method_names[] = array(
+        'full_name'   => $method_name,
+        'group_name'  => reset(explode('.', $method_name)),
+      );
+    }
+    $method_names = igroup($method_names, 'group_name');
+    ksort($method_names);
+
+    $items = array();
+    foreach ($method_names as $group => $methods) {
+      $items[] = phutil_render_tag(
+        'a',
+        array(
+        ),
+        phutil_escape_html($group));
+      foreach ($methods as $method) {
+        $method_name = $method['full_name'];
+        $selected = ($method_name == $this->method);
+        $items[] = phutil_render_tag(
+          'a',
+          array(
+            'class' => $selected ? 'aphront-side-nav-selected' : null,
+            'href'  => '/conduit/method/'.$method_name,
+          ),
+          '<span style="padding-left: 1em;">'.
+            phutil_escape_html($method_name).
+          '</span>');
+      }
+      $items[] = '<hr />';
+    }
+    // Pop off the last '<hr />'.
+    array_pop($items);
+
+    return $items;
+  }
+
+  private function getAllMethods() {
+    $classes = $this->getAllMethodImplementationClasses();
+    $methods = array();
+    foreach ($classes as $class) {
+      $name = ConduitAPIMethod::getAPIMethodNameFromClassName($class);
+      $methods[$name] = $class;
+    }
+    return $methods;
+  }
+
+  private function getAllMethodImplementationClasses() {
+    $classes = id(new PhutilSymbolLoader())
+      ->setAncestorClass('ConduitAPIMethod')
+      ->setType('class')
+      ->selectSymbolsWithoutLoading();
+    return array_values(ipull($classes, 'name'));
+  }
+
+}
diff --git a/src/applications/conduit/controller/console/__init__.php b/src/applications/conduit/controller/console/__init__.php
new file mode 100644
index 0000000000..43e8fc4f1f
--- /dev/null
+++ b/src/applications/conduit/controller/console/__init__.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/conduit/controller/base');
+phutil_require_module('phabricator', 'applications/conduit/method/base');
+phutil_require_module('phabricator', 'view/form/base');
+phutil_require_module('phabricator', 'view/form/control/submit');
+phutil_require_module('phabricator', 'view/form/control/text');
+phutil_require_module('phabricator', 'view/layout/panel');
+phutil_require_module('phabricator', 'view/layout/sidenav');
+
+phutil_require_module('phutil', 'markup');
+phutil_require_module('phutil', 'symbols');
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('PhabricatorConduitConsoleController.php');
diff --git a/src/applications/conduit/controller/log/PhabricatorConduitLogController.php b/src/applications/conduit/controller/log/PhabricatorConduitLogController.php
new file mode 100644
index 0000000000..0b9433cb11
--- /dev/null
+++ b/src/applications/conduit/controller/log/PhabricatorConduitLogController.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class PhabricatorConduitLogController extends PhabricatorConduitController {
+
+  public function processRequest() {
+
+    return $this->buildStandardPageResponse('stuff', array(
+      'title' => 'Conduit Logs',
+      'tab'   => 'logs',
+      ));
+  }
+}
diff --git a/src/applications/conduit/controller/log/__init__.php b/src/applications/conduit/controller/log/__init__.php
new file mode 100644
index 0000000000..cbe5f7c474
--- /dev/null
+++ b/src/applications/conduit/controller/log/__init__.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/conduit/controller/base');
+
+
+phutil_require_source('PhabricatorConduitLogController.php');
diff --git a/src/applications/conduit/method/base/ConduitAPIMethod.php b/src/applications/conduit/method/base/ConduitAPIMethod.php
new file mode 100644
index 0000000000..8ddfa136a4
--- /dev/null
+++ b/src/applications/conduit/method/base/ConduitAPIMethod.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+abstract class ConduitAPIMethod {
+
+  abstract public function getMethodDescription();
+  abstract public function defineParamTypes();
+  abstract public function defineReturnType();
+  abstract public function defineErrorTypes();
+  abstract protected function execute(ConduitAPIRequest $request);
+
+  public function __construct() {
+
+  }
+
+  public function getErrorDescription($error_code) {
+    return idx($this->defineErrorTypes(), $error_code, 'Unknown Error');
+  }
+
+  public function executeMethod(ConduitAPIRequest $request) {
+    return $this->execute($request);
+  }
+
+  public function getAPIMethodName() {
+    return self::getAPIMethodNameFromClassName(get_class($this));
+  }
+
+  public static function getClassNameFromAPIMethodName($method_name) {
+    $method_fragment = str_replace('.', '_', $method_name);
+    return 'ConduitAPI_'.$method_fragment.'_Method';
+  }
+
+  public static function getAPIMethodNameFromClassName($class_name) {
+    $match = null;
+    $is_valid = preg_match(
+      '/^ConduitAPI_(.*)_Method$/',
+      $class_name,
+      $match);
+    if (!$is_valid) {
+      throw new Exception(
+        "Parameter '{$class_name}' is not a valid Conduit API method class.");
+    }
+    $method_fragment = $match[1];
+    return str_replace('_', '.', $method_fragment);
+  }
+
+}
diff --git a/src/applications/conduit/method/base/__init__.php b/src/applications/conduit/method/base/__init__.php
new file mode 100644
index 0000000000..f7268ea664
--- /dev/null
+++ b/src/applications/conduit/method/base/__init__.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phutil', 'utils');
+
+
+phutil_require_source('ConduitAPIMethod.php');
diff --git a/src/applications/conduit/method/file/upload/ConduitAPI_file_upload_Method.php b/src/applications/conduit/method/file/upload/ConduitAPI_file_upload_Method.php
new file mode 100644
index 0000000000..308852418a
--- /dev/null
+++ b/src/applications/conduit/method/file/upload/ConduitAPI_file_upload_Method.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class ConduitAPI_file_upload_Method extends ConduitAPIMethod {
+
+  public function getMethodDescription() {
+    return "Upload a file to the server.";
+  }
+
+  public function defineParamTypes() {
+    return array(
+      'data_base64' => 'required nonempty base64-bytes',
+      'name' => 'optional string',
+    );
+  }
+
+  public function defineReturnType() {
+    return 'nonempty guid';
+  }
+
+  public function defineErrorTypes() {
+    return array(
+    );
+  }
+
+  protected function execute(ConduitAPIRequest $request) {
+    $data = $request->getValue('data_base64');
+    $name = $request->getValue('name');
+    $data = base64_decode($data, $strict = true);
+
+    $file = PhabricatorFile::newFromFileData(
+      $data,
+      array(
+        'name' => $name
+      ));
+    return $file->getPHID();
+  }
+
+}
diff --git a/src/applications/conduit/method/file/upload/__init__.php b/src/applications/conduit/method/file/upload/__init__.php
new file mode 100644
index 0000000000..5b0c10c04c
--- /dev/null
+++ b/src/applications/conduit/method/file/upload/__init__.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/conduit/method/base');
+phutil_require_module('phabricator', 'applications/files/storage/file');
+
+
+phutil_require_source('ConduitAPI_file_upload_Method.php');
diff --git a/src/applications/conduit/protocol/exception/ConduitException.php b/src/applications/conduit/protocol/exception/ConduitException.php
new file mode 100644
index 0000000000..069d0a8ab8
--- /dev/null
+++ b/src/applications/conduit/protocol/exception/ConduitException.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class ConduitException extends Exception {
+}
diff --git a/src/applications/conduit/protocol/exception/__init__.php b/src/applications/conduit/protocol/exception/__init__.php
new file mode 100644
index 0000000000..eebf6eb982
--- /dev/null
+++ b/src/applications/conduit/protocol/exception/__init__.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+
+phutil_require_source('ConduitException.php');
diff --git a/src/applications/conduit/protocol/request/ConduitAPIRequest.php b/src/applications/conduit/protocol/request/ConduitAPIRequest.php
new file mode 100644
index 0000000000..1f33ce0d56
--- /dev/null
+++ b/src/applications/conduit/protocol/request/ConduitAPIRequest.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class ConduitAPIRequest {
+
+  protected $params;
+
+  public function __construct(array $params) {
+    $this->params = $params;
+  }
+
+  public function getValue($key) {
+    return $this->params[$key];
+  }
+
+  public function getAllParameters() {
+    return $this->params;
+  }
+
+}
diff --git a/src/applications/conduit/protocol/request/__init__.php b/src/applications/conduit/protocol/request/__init__.php
new file mode 100644
index 0000000000..5aa52afcf9
--- /dev/null
+++ b/src/applications/conduit/protocol/request/__init__.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+
+phutil_require_source('ConduitAPIRequest.php');
diff --git a/src/applications/conduit/storage/base/PhabricatorConduitDAO.php b/src/applications/conduit/storage/base/PhabricatorConduitDAO.php
new file mode 100644
index 0000000000..15b79793ff
--- /dev/null
+++ b/src/applications/conduit/storage/base/PhabricatorConduitDAO.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+abstract class PhabricatorConduitDAO extends PhabricatorLiskDAO {
+
+  public function getApplicationName() {
+    return 'conduit';
+  }
+
+}
diff --git a/src/applications/conduit/storage/base/__init__.php b/src/applications/conduit/storage/base/__init__.php
new file mode 100644
index 0000000000..fc4cb60fd8
--- /dev/null
+++ b/src/applications/conduit/storage/base/__init__.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/base/storage/lisk');
+
+
+phutil_require_source('PhabricatorConduitDAO.php');
diff --git a/src/applications/conduit/storage/connectionlog/PhabricatorConduitConnectionLog.php b/src/applications/conduit/storage/connectionlog/PhabricatorConduitConnectionLog.php
new file mode 100644
index 0000000000..e1de62be0c
--- /dev/null
+++ b/src/applications/conduit/storage/connectionlog/PhabricatorConduitConnectionLog.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class PhabricatorConduitConnectionLog extends PhabricatorConduitDAO {
+
+  protected $client;
+  protected $clientVersion;
+  protected $clientDescription;
+  protected $username;
+
+}
diff --git a/src/applications/conduit/storage/connectionlog/__init__.php b/src/applications/conduit/storage/connectionlog/__init__.php
new file mode 100644
index 0000000000..7e2c11cfb1
--- /dev/null
+++ b/src/applications/conduit/storage/connectionlog/__init__.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/conduit/storage/base');
+
+
+phutil_require_source('PhabricatorConduitConnectionLog.php');
diff --git a/src/applications/conduit/storage/methodcalllog/PhabricatorConduitMethodCallLog.php b/src/applications/conduit/storage/methodcalllog/PhabricatorConduitMethodCallLog.php
new file mode 100644
index 0000000000..7a79d47ade
--- /dev/null
+++ b/src/applications/conduit/storage/methodcalllog/PhabricatorConduitMethodCallLog.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class PhabricatorConduitMethodCallLog extends PhabricatorConduitDAO {
+
+  protected $connectionID;
+  protected $method;
+  protected $error;
+  protected $duration;
+
+}
diff --git a/src/applications/conduit/storage/methodcalllog/__init__.php b/src/applications/conduit/storage/methodcalllog/__init__.php
new file mode 100644
index 0000000000..2e4beff080
--- /dev/null
+++ b/src/applications/conduit/storage/methodcalllog/__init__.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'applications/conduit/storage/base');
+
+
+phutil_require_source('PhabricatorConduitMethodCallLog.php');
diff --git a/src/view/layout/panel/AphrontPanelView.php b/src/view/layout/panel/AphrontPanelView.php
index 105be61596..2672002d51 100755
--- a/src/view/layout/panel/AphrontPanelView.php
+++ b/src/view/layout/panel/AphrontPanelView.php
@@ -20,6 +20,7 @@ final class AphrontPanelView extends AphrontView {
 
   const WIDTH_FULL = 'full';
   const WIDTH_FORM = 'form';
+  const WIDTH_WIDE = 'wide';
 
   private $createButton;
   private $header;
diff --git a/src/view/layout/sidenav/AphrontSideNavView.php b/src/view/layout/sidenav/AphrontSideNavView.php
new file mode 100755
index 0000000000..c0ababfad0
--- /dev/null
+++ b/src/view/layout/sidenav/AphrontSideNavView.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * Copyright 2011 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+final class AphrontSideNavView extends AphrontView {
+
+  protected $items = array();
+
+  public function addNavItem($item) {
+    $this->items[] = $item;
+    return $this;
+  }
+
+  public function render() {
+    $view = new AphrontNullView();
+    $view->appendChild($this->items);
+
+    return
+      '<table class="aphront-side-nav-view">'.
+        '<tr>'.
+          '<th class="aphront-side-nav-navigation">'.
+            $view->render().
+          '</th>'.
+          '<td class="aphront-side-nav-content">'.
+            $this->renderChildren().
+          '</td>'.
+        '</tr>'.
+      '</table>';
+  }
+
+}
diff --git a/src/view/layout/sidenav/__init__.php b/src/view/layout/sidenav/__init__.php
new file mode 100644
index 0000000000..b32c493b63
--- /dev/null
+++ b/src/view/layout/sidenav/__init__.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * This file is automatically generated. Lint this module to rebuild it.
+ * @generated
+ */
+
+
+
+phutil_require_module('phabricator', 'view/base');
+phutil_require_module('phabricator', 'view/null');
+
+
+phutil_require_source('AphrontSideNavView.php');
diff --git a/webroot/rsrc/css/base.css b/webroot/rsrc/css/base.css
index f305a544c2..b09d207769 100644
--- a/webroot/rsrc/css/base.css
+++ b/webroot/rsrc/css/base.css
@@ -343,6 +343,12 @@ a.small:visited {
   margin-left: auto;
 }
 
+.aphront-panel-width-wide {
+  width: 1080px;
+  margin-right: auto;
+  margin-left: auto;
+}  
+
 .aphront-table-view {
   width:            100%;
   border-collapse:  collapse;
@@ -486,7 +492,14 @@ a.small:visited {
   background: #f9b9bc;
 }
 
+.aphront-form-instructions {
+  margin: 2em 3%;
+}
 
+.aphront-form-control-static .aphront-form-input {
+  padding-top: 4px;
+  font-size: 13px;
+}
 
 /******************************************************************************/
 
@@ -532,3 +545,51 @@ a.small:visited {
 }
 
 
+
+/******************************************************************************/
+
+/* side nav */
+
+/******************************************************************************/
+
+
+table.aphront-side-nav-view {
+  width: 100%;
+}
+
+td.aphront-side-nav-content {
+  width: 100%;
+}
+
+th.aphront-side-nav-navigation {
+  border-right: 1px solid #bbbbbb;
+}
+
+th.aphront-side-nav-navigation a {
+  display: block;
+  margin: 0 0 2px;
+  min-width: 150px;
+  padding: 3px 8px 3px 24px;
+  font-weight: bold;
+  white-space: nowrap;
+  text-decoration: none;
+}
+
+th.aphront-side-nav-navigation a:hover {
+  text-decoration: none;
+  background:     #f3f3f9;
+}
+
+th.aphront-side-nav-navigation hr {
+  height:         1px;
+  background:     #eeeeee;
+  border:         0px;
+  margin:         12px 0px;
+}
+
+th.aphront-side-nav-navigation a.aphront-side-nav-selected,
+th.aphront-side-nav-navigation a.aphront-side-nav-selected:hover {
+  background:     #d8dfea;
+}
+
+  
\ No newline at end of file