litefeel / writing-on-github

lib/controller.php

Indentation +228 added lines, -228 removed lines

@@ -9,232 +9,232 @@
  */
 class Writing_On_GitHub_Controller {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    public $app;
-
-    /**
-     * Instantiates a new Controller object
-     *
-     * @param Writing_On_GitHub $app Applicatio container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Webhook callback as triggered from GitHub push.
-     *
-     * Reads the Webhook payload and syncs posts as necessary.
-     *
-     * @return boolean
-     */
-    public function pull_posts() {
-        $this->set_ajax();
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::pull_posts()' )
-            ) );
-        }
-
-        if ( ! $this->app->request()->is_secret_valid() ) {
-            return $this->app->response()->error( new WP_Error(
-                'invalid_headers',
-                __( 'Failed to validate secret.', 'writing-on-github' )
-            ) );
-        }
-
-        // ping
-        if ( $this->app->request()->is_ping() ) {
-            return $this->app->response()->success( __( 'Wordpress is ready.', 'writing-on-github' ) );
-        }
-
-        // push
-        if ( ! $this->app->request()->is_push() ) {
-            return $this->app->response()->error( new WP_Error(
-                'invalid_headers',
-                sprintf( 'Failed to validate webhook event: %s.',
-                    $this->app->request()->webhook_event() )
-            ) );
-        }
-        $payload = $this->app->request()->payload();
-
-        $error = $payload->should_import();
-        if ( is_wp_error( $error ) ) {
-            /*　@var WP_Error $error */
-            return $this->app->response()->error( $error );
-        }
-
-        $this->app->semaphore()->lock();
-        remove_action( 'save_post', array( $this, 'export_post' ) );
-        remove_action( 'delete_post', array( $this, 'delete_post' ) );
-
-        $result = $this->app->import()->payload( $payload );
-
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
-        }
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Imports posts from the current master branch.
-     * @param  integer $user_id
-     * @param  boolean $force
-     * @return boolean
-     */
-    public function import_master( $user_id = 0, $force = false ) {
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::import_master()' )
-            ) );
-        }
-
-        $this->app->semaphore()->lock();
-        remove_action( 'save_post', array( $this, 'export_post' ) );
-        remove_action( 'save_post', array( $this, 'delete_post' ) );
-
-        if ( $user_id ) {
-            wp_set_current_user( $user_id );
-        }
-
-        $result = $this->app->import()->master( $force );
-
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            update_option( '_wogh_import_error', $result->get_error_message() );
-
-            return $this->app->response()->error( $result );
-        }
-
-        update_option( '_wogh_import_complete', 'yes' );
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Export all the posts in the database to GitHub.
-     *
-     * @param  int        $user_id
-     * @param  boolean    $force
-     * @return boolean
-     */
-    public function export_all( $user_id = 0, $force = false ) {
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_all()' )
-            ) );
-        }
-
-        $this->app->semaphore()->lock();
-
-        if ( $user_id ) {
-            wp_set_current_user( $user_id );
-        }
-
-        $result = $this->app->export()->full($force);
-        $this->app->semaphore()->unlock();
-
-        // Maybe move option updating out of this class/upgrade message display?
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            update_option( '_wogh_export_error', $result->get_error_message() );
-
-            return $this->app->response()->error( $result );
-        } else {
-            update_option( '_wogh_export_complete', 'yes' );
-            update_option( '_wogh_fully_exported', 'yes' );
-
-            return $this->app->response()->success( $result );
-        }
-    }
-
-    /**
-     * Exports a single post to GitHub by ID.
-     *
-     * Called on the save_post hook.
-     *
-     * @param int $post_id Post ID.
-     *
-     * @return boolean
-     */
-    public function export_post( $post_id ) {
-        if ( wp_is_post_revision( $post_id ) ) {
-            return;
-        }
-
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_post()' )
-            ) );
-        }
-
-        $this->app->semaphore()->lock();
-        $result = $this->app->export()->update( $post_id );
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
-        }
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Removes the post from the tree.
-     *
-     * Called the delete_post hook.
-     *
-     * @param int $post_id Post ID.
-     *
-     * @return boolean
-     */
-    public function delete_post( $post_id ) {
-        if ( wp_is_post_revision( $post_id ) ) {
-            return;
-        }
-
-        if ( ! $this->app->semaphore()->is_open() ) {
-            return $this->app->response()->error( new WP_Error(
-                'semaphore_locked',
-                sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::delete_post()' )
-            ) );
-        }
-
-        $this->app->semaphore()->lock();
-        $result = $this->app->export()->delete( $post_id );
-        $this->app->semaphore()->unlock();
-
-        if ( is_wp_error( $result ) ) {
-            /*　@var WP_Error $result */
-            return $this->app->response()->error( $result );
-        }
-
-        return $this->app->response()->success( $result );
-    }
-
-    /**
-     * Indicates we're running our own AJAX hook
-     * and thus should respond with JSON, rather
-     * than just returning data.
-     */
-    protected function set_ajax() {
-        if ( ! defined( 'WOGH_AJAX' ) ) {
-            define( 'WOGH_AJAX', true );
-        }
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	public $app;
+
+	/**
+	 * Instantiates a new Controller object
+	 *
+	 * @param Writing_On_GitHub $app Applicatio container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Webhook callback as triggered from GitHub push.
+	 *
+	 * Reads the Webhook payload and syncs posts as necessary.
+	 *
+	 * @return boolean
+	 */
+	public function pull_posts() {
+		$this->set_ajax();
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::pull_posts()' )
+			) );
+		}
+
+		if ( ! $this->app->request()->is_secret_valid() ) {
+			return $this->app->response()->error( new WP_Error(
+				'invalid_headers',
+				__( 'Failed to validate secret.', 'writing-on-github' )
+			) );
+		}
+
+		// ping
+		if ( $this->app->request()->is_ping() ) {
+			return $this->app->response()->success( __( 'Wordpress is ready.', 'writing-on-github' ) );
+		}
+
+		// push
+		if ( ! $this->app->request()->is_push() ) {
+			return $this->app->response()->error( new WP_Error(
+				'invalid_headers',
+				sprintf( 'Failed to validate webhook event: %s.',
+					$this->app->request()->webhook_event() )
+			) );
+		}
+		$payload = $this->app->request()->payload();
+
+		$error = $payload->should_import();
+		if ( is_wp_error( $error ) ) {
+			/*　@var WP_Error $error */
+			return $this->app->response()->error( $error );
+		}
+
+		$this->app->semaphore()->lock();
+		remove_action( 'save_post', array( $this, 'export_post' ) );
+		remove_action( 'delete_post', array( $this, 'delete_post' ) );
+
+		$result = $this->app->import()->payload( $payload );
+
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			return $this->app->response()->error( $result );
+		}
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Imports posts from the current master branch.
+	 * @param  integer $user_id
+	 * @param  boolean $force
+	 * @return boolean
+	 */
+	public function import_master( $user_id = 0, $force = false ) {
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::import_master()' )
+			) );
+		}
+
+		$this->app->semaphore()->lock();
+		remove_action( 'save_post', array( $this, 'export_post' ) );
+		remove_action( 'save_post', array( $this, 'delete_post' ) );
+
+		if ( $user_id ) {
+			wp_set_current_user( $user_id );
+		}
+
+		$result = $this->app->import()->master( $force );
+
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			update_option( '_wogh_import_error', $result->get_error_message() );
+
+			return $this->app->response()->error( $result );
+		}
+
+		update_option( '_wogh_import_complete', 'yes' );
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Export all the posts in the database to GitHub.
+	 *
+	 * @param  int        $user_id
+	 * @param  boolean    $force
+	 * @return boolean
+	 */
+	public function export_all( $user_id = 0, $force = false ) {
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_all()' )
+			) );
+		}
+
+		$this->app->semaphore()->lock();
+
+		if ( $user_id ) {
+			wp_set_current_user( $user_id );
+		}
+
+		$result = $this->app->export()->full($force);
+		$this->app->semaphore()->unlock();
+
+		// Maybe move option updating out of this class/upgrade message display?
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			update_option( '_wogh_export_error', $result->get_error_message() );
+
+			return $this->app->response()->error( $result );
+		} else {
+			update_option( '_wogh_export_complete', 'yes' );
+			update_option( '_wogh_fully_exported', 'yes' );
+
+			return $this->app->response()->success( $result );
+		}
+	}
+
+	/**
+	 * Exports a single post to GitHub by ID.
+	 *
+	 * Called on the save_post hook.
+	 *
+	 * @param int $post_id Post ID.
+	 *
+	 * @return boolean
+	 */
+	public function export_post( $post_id ) {
+		if ( wp_is_post_revision( $post_id ) ) {
+			return;
+		}
+
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::export_post()' )
+			) );
+		}
+
+		$this->app->semaphore()->lock();
+		$result = $this->app->export()->update( $post_id );
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			return $this->app->response()->error( $result );
+		}
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Removes the post from the tree.
+	 *
+	 * Called the delete_post hook.
+	 *
+	 * @param int $post_id Post ID.
+	 *
+	 * @return boolean
+	 */
+	public function delete_post( $post_id ) {
+		if ( wp_is_post_revision( $post_id ) ) {
+			return;
+		}
+
+		if ( ! $this->app->semaphore()->is_open() ) {
+			return $this->app->response()->error( new WP_Error(
+				'semaphore_locked',
+				sprintf( __( '%s : Semaphore is locked, import/export already in progress.', 'writing-on-github' ), 'Controller::delete_post()' )
+			) );
+		}
+
+		$this->app->semaphore()->lock();
+		$result = $this->app->export()->delete( $post_id );
+		$this->app->semaphore()->unlock();
+
+		if ( is_wp_error( $result ) ) {
+			/*　@var WP_Error $result */
+			return $this->app->response()->error( $result );
+		}
+
+		return $this->app->response()->success( $result );
+	}
+
+	/**
+	 * Indicates we're running our own AJAX hook
+	 * and thus should respond with JSON, rather
+	 * than just returning data.
+	 */
+	protected function set_ajax() {
+		if ( ! defined( 'WOGH_AJAX' ) ) {
+			define( 'WOGH_AJAX', true );
+		}
+	}
 }

lib/request.php

Indentation +135 added lines, -135 removed lines

@@ -9,139 +9,139 @@
  */
 class Writing_On_GitHub_Request {
 
-    /**
-     * Application container.
-     *
-     * @var Writing_On_GitHub
-     */
-    protected $app;
-
-    /**
-     * Raw request data.
-     *
-     * @var string
-     */
-    protected $raw_data;
-
-    /**
-     * Headers
-     * @var array
-     */
-    protected $headers;
-
-    /**
-     * Writing_On_GitHub_Request constructor.
-     *
-     * @param Writing_On_GitHub $app Application container.
-     */
-    public function __construct( Writing_On_GitHub $app ) {
-        $this->app = $app;
-    }
-
-    /**
-     * Validates the header's secret.
-     *
-     * @return true|WP_Error
-     */
-    public function is_secret_valid() {
-        $headers = $this->headers();
-
-        $this->raw_data = $this->read_raw_data();
-
-        // Validate request secret.
-        $hash = hash_hmac( 'sha1', $this->raw_data, $this->secret() );
-        if ( 'sha1=' . $hash !== $headers['X-Hub-Signature'] ) {
-            return false;
-        }
-
-        //      [X-Hub-Signature] => sha1=3cf3da70de401f7dfff053392f60cc534efed3b4
-        //     [Content-Type] => application/json
-        //     [X-Github-Delivery] => b2102500-0acf-11e7-8acb-fd86a3497c2f
-        //     [X-Github-Event] => ping
-
-        return true;
-    }
-
-    /**
-     * Validates the ping event.
-     * @return boolean
-     */
-    public function is_ping() {
-        return 'ping' == $this->webhook_event();
-    }
-
-    /**
-     * Validates the push event.
-     * @return boolean
-     */
-    public function is_push() {
-        return 'push' == $this->webhook_event();
-    }
-
-    /**
-     * Return X-Github-Event in headers.
-     * @return string
-     */
-    public function webhook_event() {
-        $headers = $this->headers();
-        return $headers['X-Github-Event'];
-    }
-
-    /**
-     * Returns a payload object for the given request.
-     *
-     * @return Writing_On_GitHub_Payload
-     */
-    public function payload() {
-        return new Writing_On_GitHub_Payload( $this->app, $this->raw_data );
-    }
-
-    /**
-     * Cross-server header support.
-     *
-     * Returns an array of the request's headers.
-     *
-     * @return array
-     */
-    protected function headers() {
-        if ( ! empty( $this->headers ) ) {
-            return $this->headers;
-        }
-
-        if ( function_exists( 'getallheaders' ) ) {
-
-            $this->headers = getallheaders();
-            return $this->headers;
-        }
-        /**
-         * Nginx and pre 5.4 workaround.
-         * @see http://www.php.net/manual/en/function.getallheaders.php
-         */
-        $this->headers = array();
-        foreach ( $_SERVER as $name => $value ) {
-            if ( 'HTTP_' === substr( $name, 0, 5 ) ) {
-                $this->headers[ str_replace( ' ', '-', ucwords( strtolower( str_replace( '_', ' ', substr( $name, 5 ) ) ) ) ) ] = $value;
-            }
-        }
-
-        return $this->headers;
-    }
-
-    /**
-     * Reads the raw data from STDIN.
-     *
-     * @return string
-     */
-    protected function read_raw_data() {
-        return file_get_contents( 'php://input' );
-    }
-
-    /**
-     * Returns the Webhook secret
-     *
-     * @return string
-     */
-    protected function secret() {
-        return get_option( 'wogh_secret' );
-    }
+	/**
+	 * Application container.
+	 *
+	 * @var Writing_On_GitHub
+	 */
+	protected $app;
+
+	/**
+	 * Raw request data.
+	 *
+	 * @var string
+	 */
+	protected $raw_data;
+
+	/**
+	 * Headers
+	 * @var array
+	 */
+	protected $headers;
+
+	/**
+	 * Writing_On_GitHub_Request constructor.
+	 *
+	 * @param Writing_On_GitHub $app Application container.
+	 */
+	public function __construct( Writing_On_GitHub $app ) {
+		$this->app = $app;
+	}
+
+	/**
+	 * Validates the header's secret.
+	 *
+	 * @return true|WP_Error
+	 */
+	public function is_secret_valid() {
+		$headers = $this->headers();
+
+		$this->raw_data = $this->read_raw_data();
+
+		// Validate request secret.
+		$hash = hash_hmac( 'sha1', $this->raw_data, $this->secret() );
+		if ( 'sha1=' . $hash !== $headers['X-Hub-Signature'] ) {
+			return false;
+		}
+
+		//      [X-Hub-Signature] => sha1=3cf3da70de401f7dfff053392f60cc534efed3b4
+		//     [Content-Type] => application/json
+		//     [X-Github-Delivery] => b2102500-0acf-11e7-8acb-fd86a3497c2f
+		//     [X-Github-Event] => ping
+
+		return true;
+	}
+
+	/**
+	 * Validates the ping event.
+	 * @return boolean
+	 */
+	public function is_ping() {
+		return 'ping' == $this->webhook_event();
+	}
+
+	/**
+	 * Validates the push event.
+	 * @return boolean
+	 */
+	public function is_push() {
+		return 'push' == $this->webhook_event();
+	}
+
+	/**
+	 * Return X-Github-Event in headers.
+	 * @return string
+	 */
+	public function webhook_event() {
+		$headers = $this->headers();
+		return $headers['X-Github-Event'];
+	}
+
+	/**
+	 * Returns a payload object for the given request.
+	 *
+	 * @return Writing_On_GitHub_Payload
+	 */
+	public function payload() {
+		return new Writing_On_GitHub_Payload( $this->app, $this->raw_data );
+	}
+
+	/**
+	 * Cross-server header support.
+	 *
+	 * Returns an array of the request's headers.
+	 *
+	 * @return array
+	 */
+	protected function headers() {
+		if ( ! empty( $this->headers ) ) {
+			return $this->headers;
+		}
+
+		if ( function_exists( 'getallheaders' ) ) {
+
+			$this->headers = getallheaders();
+			return $this->headers;
+		}
+		/**
+		 * Nginx and pre 5.4 workaround.
+		 * @see http://www.php.net/manual/en/function.getallheaders.php
+		 */
+		$this->headers = array();
+		foreach ( $_SERVER as $name => $value ) {
+			if ( 'HTTP_' === substr( $name, 0, 5 ) ) {
+				$this->headers[ str_replace( ' ', '-', ucwords( strtolower( str_replace( '_', ' ', substr( $name, 5 ) ) ) ) ) ] = $value;
+			}
+		}
+
+		return $this->headers;
+	}
+
+	/**
+	 * Reads the raw data from STDIN.
+	 *
+	 * @return string
+	 */
+	protected function read_raw_data() {
+		return file_get_contents( 'php://input' );
+	}
+
+	/**
+	 * Returns the Webhook secret
+	 *
+	 * @return string
+	 */
+	protected function secret() {
+		return get_option( 'wogh_secret' );
+	}
 }