Merge pull request #93 from travis-ci/bug-fix-cycle-12

Bug fix cycle 12

Author: murtaza-swati

Gemfile

@@ -34,4 +34,5 @@ end
 
 group :test do
   gem 'rack-test'
+  gem 'timecop'
 end

Gemfile.lock

@@ -83,6 +83,7 @@ GEM
     thor (0.20.0)
     thread_safe (0.3.6)
     tilt (2.0.8)
+    timecop (0.9.1)
     travis-config (1.0.13)
       hashr (~> 2.0.0)
     tzinfo (1.2.5)
@@ -107,6 +108,7 @@ DEPENDENCIES
   sentry-raven
   sidekiq (~> 4.0.0)
   sinatra (~> 2.0.3)
+  timecop
   travis-config (~> 1.0.0)
   travis-support!
   yajl-ruby (~> 1.4.0)

lib/travis/listener/app.rb

@@ -111,6 +111,10 @@ def dispatch_event
 
         return unless handle_event?
 
+        # According to GitHub every webhook payload should have this
+        # If it is not present, assume payload is malformed
+        return unless payload['sender']
+
         debug "Event payload for #{uuid}: #{payload.inspect}"
 
         log_event
@@ -178,6 +182,7 @@ def data
           :uuid         => uuid,
           :github_guid  => delivery_guid,
           :github_event => event_type,
+          :received_at  => Time.now,
         }
       end
 

lib/travis/listener/schemas.rb

@@ -144,37 +144,37 @@ def self.event_details(event_type, payload)
             source:       payload['pull_request']['head']['repo'] && payload['pull_request']['head']['repo']['full_name'],
             head:         payload['pull_request']['head']['sha'][0..6],
             ref:          payload['pull_request']['head']['ref'],
-            user:         payload['pull_request']['head']['user']['login'],
-            sender:       payload['sender']['login'],
-            sender_type:  payload['sender']['type']
+            user:         payload['pull_request']['head'].fetch('user', {}).fetch('login', ''),
+            sender:       payload['sender'].fetch('login', ''),
+            sender_type:  payload['sender'].fetch('type', '')
           }
         when 'push'
           {
             repository:   payload["repository"]["full_name"],
             ref:          payload['ref'],
             head:         payload['head_commit'] && payload['head_commit']['id'][0..6],
             commits:      (payload["commits"] || []).map {|c| c['id'][0..6]}.join(","),
-            sender:       payload['sender']['login'],
-            sender_type:  payload['sender']['type']
+            sender:       payload['sender'].fetch('login', ''),
+            sender_type:  payload['sender'].fetch('type', '')
           }
         when 'check_suite'
           {
             action:     payload['action'],
             ref_type:   payload['check_suite']['ref_type'],
             repository: payload["repository"]["full_name"],
-            sender:     payload['sender']['login']
+            sender:     payload['sender'].fetch('login', '')
           }
         when 'create', 'delete', 'repository', 'check_run'
           {
             action:     payload['action'],
             repository: payload["repository"]["full_name"],
-            sender:     payload['sender']['login']
+            sender:     payload['sender'].fetch('login', '')
           }
         when 'installation', 'installation_repositories'
           {
             action:       payload['action'],
             installation: payload["installation"]["account"]["login"],
-            sender:       payload['sender']['login']
+            sender:       payload['sender'].fetch('login', '')
           }
         else
           { }

spec/spec_helper.rb

@@ -18,6 +18,9 @@
   c.run_all_when_everything_filtered = true
 end
 
+require 'timecop'
+Timecop.freeze('2022-01-01 00:02:00 +0200')
+
 module Payloads
   def self.load(path)
     File.read(File.expand_path("../payloads/#{path}.json", __FILE__))
@@ -28,5 +31,6 @@ def self.load(path)
   :type => 'push',
   :uuid => Travis.uuid,
   :github_guid => 'abc123',
-  :github_event => 'push'
+  :github_event => 'push',
+  :received_at => Time.now
 }