Add latest changes from gitlab-org/gitlab@master

3 files changed, 9 insertions, 0 deletions

diff --git a/app/services/packages/debian/create_package_file_service.rb b/app/services/packages/debian/create_package_file_service.rb
index 2022a63a725..fbbc8159ca0 100644
--- a/app/services/packages/debian/create_package_file_service.rb
+++ b/app/services/packages/debian/create_package_file_service.rb
@@ -3,12 +3,15 @@
 module Packages
   module Debian
     class CreatePackageFileService
+      include ::Packages::FIPS
+
       def initialize(package, params)
         @package = package
         @params = params
       end
 
       def execute
+        raise DisabledError, 'Debian registry is not FIPS compliant' if Gitlab::FIPS.enabled?
         raise ArgumentError, "Invalid package" unless package.present?
 
         # Debian package file are first uploaded to incoming with empty metadata,
diff --git a/app/services/packages/debian/extract_changes_metadata_service.rb b/app/services/packages/debian/extract_changes_metadata_service.rb
index 43a4db5bdfc..30480834748 100644
--- a/app/services/packages/debian/extract_changes_metadata_service.rb
+++ b/app/services/packages/debian/extract_changes_metadata_service.rb
@@ -4,6 +4,7 @@ module Packages
   module Debian
     class ExtractChangesMetadataService
       include Gitlab::Utils::StrongMemoize
+      include ::Packages::FIPS
 
       ExtractionError = Class.new(StandardError)
 
@@ -13,6 +14,8 @@ module Packages
       end
 
       def execute
+        raise DisabledError, 'Debian registry is not FIPS compliant' if Gitlab::FIPS.enabled?
+
         {
           file_type: file_type,
           architecture: metadata[:architecture],
diff --git a/app/services/packages/debian/generate_distribution_service.rb b/app/services/packages/debian/generate_distribution_service.rb
index 33bf877a153..7db27f9234d 100644
--- a/app/services/packages/debian/generate_distribution_service.rb
+++ b/app/services/packages/debian/generate_distribution_service.rb
@@ -4,6 +4,7 @@ module Packages
   module Debian
     class GenerateDistributionService
       include Gitlab::Utils::StrongMemoize
+      include ::Packages::FIPS
       include ExclusiveLeaseGuard
 
       ONE_HOUR = 1.hour.freeze
@@ -70,6 +71,8 @@ module Packages
       end
 
       def execute
+        raise DisabledError, 'Debian registry is not FIPS compliant' if Gitlab::FIPS.enabled?
+
         try_obtain_lease do
           @distribution.transaction do
             # We consider `apt-get update` can take at most one hour