gitlab-username_bot_identifier 1.0.4 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9935b476a0772606b980aeef481ec29270bde310311333b2bdb79fee9a24f73e
-  data.tar.gz: f0de479d4e5e0ed51514f65dc6b9ca7b48747bf87742211597b55286ef8d83bd
+  metadata.gz: '0810c40de2bcbf8e926752377d842353154e34d7c666571cad926b5289bc7c6a'
+  data.tar.gz: 8353de435d72394df7b10d14907276c64eb8ac64477ad2f1b03ef1098eba4cee
 SHA512:
-  metadata.gz: d08e1a0b66ea8e6cbeb69d5ad7d33a109e5d2ab7980921cdc72d6fe79a78e7a1b8981d4a22f176ec77c67b320970b3720f7629c89ec88a39ebff345a2a5ca8f4
-  data.tar.gz: f7caddf751e71b6356d7a92a952c623711d3e1bbf43db15c7d4199754918df369a89f20e8812fe3e4f9e2152f14fd9c9f38a45d58b796a559caa678e464f6a08
+  metadata.gz: b102e2ce6232f88c722cbcbc2c9d3ef7bf25a01320c8ee198cabf10ee354a511acb9bdaa89b44fdc29488ba40289e1a69631339cb5ba8d0652380e4c1aa9395a
+  data.tar.gz: 1385b9106b4428e9b65d2fa2d936963d2451a264bb3a2976251df360a94ff8e78c91625c1503534bca485f2492ae6ec52ed084677cd19751dbe551a50c11e6e9

data/gitlab-username_bot_identifier.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://gitlab.com/gitlab-org/ruby/gems/gitlab-username-bot-identifier'
-  spec.metadata['changelog_uri'] = 'https://gitlab.com/gitlab-org/ruby/gems/gitlab-username-bot-identifier/-/blob/master/CHANGELOG.md'
+  spec.metadata['changelog_uri'] = 'https://gitlab.com/gitlab-org/ruby/gems/gitlab-username_bot_identifier/-/releases'
   spec.metadata['rubygems_mfa_required'] = 'true'
 
   spec.files = [

data/lib/gitlab/username_bot_identifier.rb

@@ -32,9 +32,10 @@ module Gitlab
     # Can be spoofed (e.g. someone can register project_1_bot, project_2_bot_abc123)
     PROJECT_ACCESS_TOKEN_REGEX = /^project_\d+_bot_?\w*$/.freeze
     GROUP_ACCESS_TOKEN_REGEX = /^group_\d+_bot_?\w*$/.freeze
+    SERVICE_ACCOUNT_REGEX = /^service_account_group_\d+_?\w*$/.freeze
 
-    # Used as best practive by GitLab team members when creating "service accounts"
-    SERVICE_ACCOUNT_REGEX = /^gl-service-[-\w]+$/.freeze
+    # Used as best practice by GitLab team members when creating "service accounts"
+    KNOWN_SERVICE_ACCOUNT_REGEX = /^gl-service-[-\w]+$/.freeze
 
     def initialize(username)
       @username = username
@@ -52,8 +53,11 @@ module Gitlab
       username == GHOST_ACCOUNT
     end
 
-    def service_account?
-      username.match?(SERVICE_ACCOUNT_REGEX)
+    # "known service accounts" are accounts that match the naming convention of service accounts
+    # registered by GitLab team members. These accounts are regular user accounts that are used
+    # in automations.
+    def known_service_account?
+      username.match?(KNOWN_SERVICE_ACCOUNT_REGEX)
     end
 
     def project_access_token?
@@ -64,6 +68,12 @@ module Gitlab
       username.match?(GROUP_ACCESS_TOKEN_REGEX)
     end
 
+    # "service accounts" are accounts that were created through the service accounts feature.
+    # See https://docs.gitlab.com/ee/user/profile/service_accounts.html
+    def service_account?
+      username.match?(SERVICE_ACCOUNT_REGEX)
+    end
+
     def project_or_group_access_token?
       project_access_token? ||
         group_access_token?
@@ -71,15 +81,17 @@ module Gitlab
 
     def bot?
       known_bot? ||
-        service_account? ||
-        project_or_group_access_token?
+        known_service_account? ||
+        project_or_group_access_token? ||
+        service_account?
     end
 
     def ignorable_account?
       known_bot? ||
         ghost? ||
-        service_account? ||
-        project_or_group_access_token?
+        known_service_account? ||
+        project_or_group_access_token? ||
+        service_account?
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-username_bot_identifier
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.1
 platform: ruby
 authors:
 - Lee Tickett
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-05-21 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -25,7 +25,7 @@ licenses:
 metadata:
   homepage_uri: https://gitlab.com/gitlab-org/ruby/gems/gitlab-username_bot_identifier
   source_code_uri: https://gitlab.com/gitlab-org/ruby/gems/gitlab-username-bot-identifier
-  changelog_uri: https://gitlab.com/gitlab-org/ruby/gems/gitlab-username-bot-identifier/-/blob/master/CHANGELOG.md
+  changelog_uri: https://gitlab.com/gitlab-org/ruby/gems/gitlab-username_bot_identifier/-/releases
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -42,7 +42,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Parse GitLab usernames to determine whether they appear to be bots.