Merge branch 'fix-composer-package-version-regex' into 'master'

Fix composer package version regex

See merge request gitlab-org/gitlab!70251

app/services/packages/composer/version_parser_service.rb

@@ -12,18 +12,19 @@ module Packages
         if @tag_name.present?
           @tag_name.delete_prefix('v')
         elsif @branch_name.present?
-          branch_sufix_or_prefix(@branch_name.match(Gitlab::Regex.composer_package_version_regex))
+          branch_suffix_or_prefix(@branch_name.match(Gitlab::Regex.composer_package_version_regex))
         end
       end
 
       private
 
-      def branch_sufix_or_prefix(match)
+      def branch_suffix_or_prefix(match)
         if match
-          if match.captures[1] == '.x'
-            match.captures[0] + '-dev'
+          captures = match.captures.reject(&:blank?)
+          if captures[-1] == '.x'
+            captures[0] + '-dev'
           else
-            match.captures[0] + '.x-dev'
+            captures[0] + '.x-dev'
           end
         else
           "dev-#{@branch_name}"

lib/gitlab/regex.rb

@@ -21,7 +21,8 @@ module Gitlab
       end
 
       def composer_package_version_regex
-        @composer_package_version_regex ||= %r{^v?(\d+(\.(\d+|x))*(-.+)?)}.freeze
+        # see https://github.com/composer/semver/blob/31f3ea725711245195f62e54ffa402d8ef2fdba9/src/VersionParser.php#L215
+        @composer_package_version_regex ||= %r{\Av?((\d++)(\.(?:\d++|[xX*]))?(\.(?:\d++|[xX*]))?(\.(?:\d++|[xX*]))?)?\z}.freeze
       end
 
       def composer_dev_version_regex

spec/lib/gitlab/regex_spec.rb

@@ -924,4 +924,25 @@ RSpec.describe Gitlab::Regex do
     it { is_expected.not_to match('/api/v4/groups/1234/packages/debian/dists/stable/Release.gpg') }
     it { is_expected.not_to match('/api/v4/groups/1234/packages/debian/pool/compon/a/pkg/file.name') }
   end
+
+  describe '.composer_package_version_regex' do
+    subject { described_class.composer_package_version_regex }
+
+    it { is_expected.to match('v1.2.3') }
+    it { is_expected.to match('v1.2.x') }
+    it { is_expected.to match('v1.2.X') }
+    it { is_expected.to match('1.2.3') }
+    it { is_expected.to match('1') }
+    it { is_expected.to match('v1') }
+    it { is_expected.to match('1.2') }
+    it { is_expected.to match('v1.2') }
+    it { is_expected.not_to match('1.2.3-beta') }
+    it { is_expected.not_to match('1.2.x-beta') }
+    it { is_expected.not_to match('1.2.X-beta') }
+    it { is_expected.not_to match('1.2.3-alpha.3') }
+    it { is_expected.not_to match('1./2.3') }
+    it { is_expected.not_to match('v1./2.3') }
+    it { is_expected.not_to match('../../../../../1.2.3') }
+    it { is_expected.not_to match('%2e%2e%2f1.2.3') }
+  end
 end

spec/services/packages/composer/version_parser_service_spec.rb

@@ -12,6 +12,7 @@ RSpec.describe Packages::Composer::VersionParserService do
     where(:tagname, :branchname, :expected_version) do
       nil             | 'master'     | 'dev-master'
       nil             | 'my-feature' | 'dev-my-feature'
+      nil             | '12-feature' | 'dev-12-feature'
       nil             | 'v1'         | '1.x-dev'
       nil             | 'v1.x'       | '1.x-dev'
       nil             | 'v1.7.x'     | '1.7.x-dev'