Proper handling of GitHub post-receive hook format.

Author: scottgonzalez

lib/hook.js

@@ -1,18 +1,10 @@
 var semver = require( "semver" ),
 	Step = require( "step" ),
 	pluginsDb = require( "./pluginsdb" ),
-	service = require( "./service" ),
 	retry = require( "./retrydb" ),
 	logger = require( "./logger" );
 
-function processHook( data, fn ) {
-	var repo = service.getRepoByHook( data );
-
-	if ( !repo ) {
-		logger.warn( "Could not parse hook: " + JSON.stringify( data ) );
-		return fn( new Error( "Could not parse hook." ) );
-	}
-
+function processHook( repo, fn ) {
 	Step(
 		function() {
 			processVersions( repo, this );

lib/service.js

@@ -377,11 +377,15 @@ module.exports = {
 	},
 
 	getRepoByHook: function( data ) {
-		if ( !services.github.test( data ) ) {
-			return null;
+		var service, parsed;
+		for ( service in services ) {
+			parsed = services[ service ].test( data );
+			if ( parsed ) {
+				return new services[ service ]( parsed );
+			}
 		}
 
-		return new services.github( data );
+		return null;
 	}
 };
 

lib/service/github.js

@@ -1,4 +1,5 @@
 var fs = require( "fs" ),
+	querystring = require( "querystring" ),
 	exec = require( "child_process" ).exec,
 	semver = require( "semver" ),
 	Step = require( "step" ),
@@ -44,7 +45,18 @@ function GithubRepo( userName, repoName ) {
 }
 
 GithubRepo.test = function( data ) {
-	return reGithubUrl.test( data.repository && data.repository.url );
+	try {
+		data = querystring.parse( data );
+		data = JSON.parse( data.payload );
+	} catch( error ) {
+		return null;
+	}
+
+	if ( reGithubUrl.test( data.repository && data.repository.url ) ) {
+		return data;
+	}
+
+	return null;
 };
 
 // service interface

scripts/update-server.js

@@ -1,4 +1,5 @@
 var http = require( "http" ),
+	service = require( "../lib/service" ),
 	hook = require( "../lib/hook" ),
 	logger = require( "../lib/logger" );
 
@@ -12,18 +13,17 @@ process.on( "uncaughtException", function( error ) {
 });
 
 var server = http.createServer(function( request, response ) {
-	var json = "";
+	var data = "";
 	request.setEncoding( "utf8" );
 	request.on( "data", function( chunk ) {
-		json += chunk;
+		data += chunk;
 	});
 
 	request.on( "end", function() {
-		try {
-			json = JSON.parse( json );
-		} catch( e ) {
-			// Invalid JSON, stop processing
-			logger.error( "Invalid request: " + json );
+		var repo = service.getRepoByHook( data );
+		if ( !repo ) {
+			// Invalid data, stop processing
+			logger.error( "Invalid request: " + data );
 			response.writeHead( 400 );
 			response.end();
 			return;
@@ -34,7 +34,7 @@ var server = http.createServer(function( request, response ) {
 		response.end();
 
 		// Process the request
-		hook.processHook( json, function( error ) {
+		hook.processHook( repo, function( error ) {
 			if ( error ) {
 				logger.error( "Error processing hook: " + error.stack );
 			}