Support private repo for CommitAuditor for differential updates

Author: newbishme

app/workers/commit_auditor.rb

@@ -23,10 +23,10 @@ class CommitAuditor
   include Sidekiq::Worker
   sidekiq_options queue: :audit_commits
 
-  def perform(project_id, commit, rules, github_token)
+  def perform(project_id, project_username, project_access_token, commit, rules, github_token)
     commit = JSON.parse(commit, symbolize_names: true)
     rules = JSON.parse(rules, symbolize_names: true)
-    diff = get_commit_diff(commit, rules, github_token)
+    diff = get_commit_diff(commit, project_username, project_access_token, rules, github_token)
 
     builder = AuditResultsBuilder.new
     results = builder.build(project_id, commit, diff, rules)
@@ -41,12 +41,12 @@ def perform(project_id, commit, rules, github_token)
 
 private
 
-  def get_commit_diff(commit, rules, github_token)
+  def get_commit_diff(commit, project_username, project_access_token, rules, github_token)
     rule_type_ids = rules.collect { |e| e[:rule_type_id] }
     diff_rule_type_ids = RuleTypes.select { |k, v| v[:requires_diff] }.keys
     return if (rule_type_ids & diff_rule_type_ids).empty?
 
-    gh = GitHubAPI.new(github_token)
+    gh = GitHubAPI.new(github_token, project_username, project_access_token)
     diff_raw = gh.get_diff(commit[:url])
     diff_raw.empty? ? nil : GitDiffParser.parse(diff_raw)
   end

app/workers/commit_collector.rb

@@ -23,11 +23,11 @@ class CommitCollector
 
   COMMITS_URL = 'https://api.github.com/repos/%s/commits'.freeze
 
-  def perform(project_id, project_name, last_commit_time, rules, github_token)
+  def perform(project_id, project_name, project_username, project_access_token, last_commit_time, rules, github_token)
     last_commit_time = Time.parse(last_commit_time)
     Rails.logger.debug "Collecting commits for #{project_name} since #{last_commit_time}"
 
-    commits = collect_commits(project_name, last_commit_time, github_token)
+    commits = collect_commits(project_name, project_username, project_access_token, last_commit_time, github_token)
     Rails.logger.debug "Collected #{commits.size} commits from #{project_name}"
     return if commits.size == 0
 
@@ -39,8 +39,8 @@ def perform(project_id, project_name, last_commit_time, rules, github_token)
     Projects[id: project_id].update(last_commit_time: last_commit_time)
   end
 
-  def collect_commits(project_name, last_commit_time, github_token)
-    gh = GitHubAPI.new(github_token)
+  def collect_commits(project_name, project_username, project_access_token, last_commit_time, github_token)
+    gh = GitHubAPI.new(github_token, project_username, project_access_token)
     gh.get_commits(project_name, last_commit_time)
   end
 end

lib/github_api.rb

@@ -23,7 +23,9 @@ class GitHubAPI
   COMMITS_URL = 'https://api.github.com/repos/%s/commits'.freeze
   REPOS_URL = 'https://api.github.com/users/%s/repos'.freeze
 
-  def initialize(token)
+  def initialize(token, project_username, project_access_token)
+    @project_username = project_username
+    @project_access_token = project_access_token
     @token = token
   end
 
@@ -86,6 +88,7 @@ def request_raw(uri, params = nil, headers = {})
       Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
         request = Net::HTTP::Get.new(uri)
         request['Authorization'] = "token #{@token}"
+        request.basic_auth @project_username, @project_access_token unless (@project_username.empty? or @project_access_token.empty?)
         headers.each { |k,v| request[k] = v }
         response = http.request(request)
       end