More GitHub webhook work

README.md

@@ -39,22 +39,53 @@ IRC formatting is supported (see a full [list of codes](tcplistener/colours.go#L
     echo "Status is%GREEN OK %NORMAL" | nc irccat-host 12345
 
 ## HTTP → IRC
-There's a similar HTTP endpoint for sending messages. You can use curl in lieu
-of netcat, with "-d @-" to read POST data from stdin, like so:
-
-    echo "Hello world" | curl -d @- http://irccat-host/send
 
-Everything that works via netcat also works by POST to /send.
+HTTP listeners are configured by setting keys under `http.listeners`.
 
-There are also endpoints which support app-specific webhooks, currently:
+### Generic HTTP Endpoint
+```json
+	"generic": true
+```
 
-* Grafana alerts can be sent to `/grafana`. They will be sent to the
-  channel defined in `http.listeners.grafana`.
+An endpoint for sending messages similar to the TCP port. You can use curl in lieu
+of netcat, with "-d @-" to read POST data from stdin, like so:
 
-More HTTP listeners welcome!
+    echo "Hello world" | curl -d @- http://irccat-host/send
 
-Note that there is (currently) no authentication on the HTTP endpoints,
-so you should make sure you firewall them from the world.
+Everything that works via netcat also works by POST to /send. Note that this endpoint
+is unauthenticated.
+
+### Grafana Webhook
+```json
+	"grafana": "#channel"
+```
+
+Grafana alerts can be sent to `/grafana`. They will be sent to the
+channel defined in `http.listeners.grafana`. Note that this endpoint is currently
+unauthenticated.
+
+### GitHub Webhooks
+```json
+	"github": {
+		"secret": "my_secret",
+		"default_channel": "#channel",
+		"repositories": {
+		    "irccat": "#irccat-dev"
+		}
+       	}
+```
+
+Receives GitHub webhooks at `/github`. Currently supports issues, issue comments,
+pull requests, pushes, and releases. The webhook needs to be configured to post data
+as JSON, not as form-encoded.
+
+The destination channel for notifications from each respository is set in
+`http.listeners.github.repositories.repo_name`, where `repo_name` is the name of the
+repository, lowercased.
+
+If `http.listeners.github.default_channel` is set, received notifications will be
+sent to this channel unless overriden in `http.listeners.github.repositories`. Otherwise,
+unrecognised repositories will be ignored.
 
 ## IRC → Shell
 You can use irccat to execute commands from IRC:

examples/irccat.json

@@ -8,9 +8,11 @@
     "tls_key": "",
     "tls_cert": "",
     "listeners": {
+      "generic": true,
       "grafana": "#channel",
       "github": {
-	"secret": "test",
+	"secret": "my_secret",
+	"default_channel": "#irccat-dev",
 	"repositories": {
 	    "irccat": "#irccat-dev"
 	}

httplistener/github.go

@@ -21,7 +21,9 @@ func (hl *HTTPListener) githubHandler(w http.ResponseWriter, request *http.Reque
 		http.NotFound(w, request)
 		return
 	}
-	hook, err := github.New() // TODO: webhook secret
+
+	hook, err := github.New(github.Options.Secret(viper.GetString("http.listeners.github.secret")))
+
 	if err != nil {
 		return
 	}
@@ -83,12 +85,16 @@ func (hl *HTTPListener) githubHandler(w http.ResponseWriter, request *http.Reque
 
 	if send {
 		repo = strings.ToLower(repo)
-		channelKey := fmt.Sprintf("http.listeners.github.repositories.%s", repo)
-		channel := viper.GetString(channelKey)
+		channel := viper.GetString(fmt.Sprintf("http.listeners.github.repositories.%s", repo))
+		if channel == "" {
+			channel = viper.GetString("http.listeners.github.default_channel")
+		}
+
 		if channel == "" {
 			log.Infof("%s GitHub event for unrecognised repository %s", request.RemoteAddr, repo)
 			return
 		}
+
 		log.Infof("%s [%s -> %s] GitHub event received", request.RemoteAddr, repo, channel)
 		for _, msg := range msgs {
 			hl.irc.Privmsgf(channel, msg)

httplistener/httplistener.go

@@ -21,10 +21,14 @@ func New(irc *irc.Connection) (*HTTPListener, error) {
 	hl.irc = irc
 	hl.http = http.Server{Addr: viper.GetString("http.listen")}
 	hl.tpls = parseTemplates()
+	log.Infof("Listening for HTTP requests on %s", viper.GetString("http.listen"))
 
 	mux := http.NewServeMux()
 
-	mux.HandleFunc("/send", hl.genericHandler)
+	if viper.GetBool("http.listeners.generic") {
+		log.Infof("Listening for HTTP POST requests at /send")
+		mux.HandleFunc("/send", hl.genericHandler)
+	}
 
 	if viper.IsSet("http.listeners.grafana") {
 		log.Infof("Listening for Grafana webhooks at /grafana")
@@ -37,7 +41,6 @@ func New(irc *irc.Connection) (*HTTPListener, error) {
 	}
 
 	hl.http.Handler = mux
-	log.Infof("Listening for HTTP requests on %s", viper.GetString("http.listen"))
 	if viper.GetBool("http.tls") {
 		go hl.http.ListenAndServeTLS(viper.GetString("http.tls_cert"), viper.GetString("http.tls_key"))
 	} else {