Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 9 insertions, 8 deletions

diff --git a/app/services/packages/npm/create_package_service.rb b/app/services/packages/npm/create_package_service.rb
index cf927683ce9..7f868b71734 100644
--- a/app/services/packages/npm/create_package_service.rb
+++ b/app/services/packages/npm/create_package_service.rb
@@ -1,24 +1,21 @@
 # frozen_string_literal: true
 module Packages
   module Npm
-    class CreatePackageService < BaseService
+    class CreatePackageService < ::Packages::CreatePackageService
       include Gitlab::Utils::StrongMemoize
 
       def execute
         return error('Version is empty.', 400) if version.blank?
         return error('Package already exists.', 403) if current_package_exists?
+        return error('File is too large.', 400) if file_size_exceeded?
 
-        ActiveRecord::Base.transaction { create_package! }
+        ActiveRecord::Base.transaction { create_npm_package! }
       end
 
       private
 
-      def create_package!
-        package = project.packages.create!(
-          name: name,
-          version: version,
-          package_type: 'npm'
-        )
+      def create_npm_package!
+        package = create_package!(:npm, name: name, version: version)
 
         if build.present?
           package.create_build_info!(pipeline: build.pipeline)
@@ -86,6 +83,10 @@ module Packages
         _version, versions_data = params[:versions].first
         versions_data
       end
+
+      def file_size_exceeded?
+        project.actual_limits.exceeded?(:npm_max_file_size, attachment['length'].to_i)
+      end
     end
   end
 end