cucumber-create-meta 1.1.0 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07a2cc315e7e6ea3c63ac025e38c7630d6f57f424e1c3df5f9a8407cae1f8b78
-  data.tar.gz: a7e517e144068c58ae338d7ab8c5528046af6e0ea72458595b9d528b5dc5fc26
+  metadata.gz: 652354ea200ccf8bd6828ae4535c2e04bd339b946c84f7cb7630eb3e969a20cd
+  data.tar.gz: d676219a81b516705a9257c043f7010c3999a2ca77300820e27f11d9c3a39a83
 SHA512:
-  metadata.gz: 4bc59d98405d5171c2ea437d165b8771372d52c6fd37c6b529fb76651a7782073e3805645b27edde08ae0173849e3b4f5145c3412757199e1bc55b271fea5d4d
-  data.tar.gz: d08e7e01eaca5536bc301a4e04393947f4a21984813da2c13cecd3042d5d9e6fcae06fdbd291b51b627fa3db7e0f0e674c8944eaeacf45340eae9f08216d6d46
+  metadata.gz: e883e3a9966ce5ddbc409c9e8df53f9da314377614da2c6b410ea882533e8be234f2827ada95c386076906fcd2bd648f96018a6185b3d0843df24929d5866ade
+  data.tar.gz: ac1d5b36027613c6d2431a4786b2f5a7ef25e6b2395275d03a80f06f95c5fcfb12175095a08273e8d06a4a482d7eb986e63a3373fb08a18d39250acb822b04ce

data/lib/cucumber/ciDict.json

@@ -45,9 +45,9 @@
     }
   },
   "GitHub Actions": {
-    "url": "${_GITHUB_BASEURL | https://github.com/}${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}",
+    "url": "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}",
     "git": {
-      "remote": "${_GITHUB_BASEURL | https://github.com/}${GITHUB_REPOSITORY}.git",
+      "remote": "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git",
       "revision": "${GITHUB_SHA}",
       "branch": "${refbranch GITHUB_REF}",
       "tag": "${reftag GITHUB_REF}"

data/lib/cucumber/create_meta.rb

@@ -1,29 +1,31 @@
+require 'uri'
 require 'cucumber/messages'
 require 'sys/uname'
 require 'json'
 
 module Cucumber
   module CreateMeta
-    CI_DICT = JSON.parse(IO.read(File.join(File.dirname(__FILE__),"ciDict.json")))
+    CI_DICT = JSON.parse(IO.read(File.join(File.dirname(__FILE__), "ciDict.json")))
 
-    def create_meta(tool_name, tool_version)
+    def create_meta(tool_name, tool_version, env = ENV)
       Cucumber::Messages::Meta.new(
-        protocol_version: Cucumber::Messages::VERSION,
-        implementation: Cucumber::Messages::Meta::Product.new(
-          name: tool_name,
-          version: tool_version
-        ),
-        runtime: Cucumber::Messages::Meta::Product.new(
-          name: RUBY_ENGINE,
-          version: RUBY_VERSION
-        ),
-        os: Cucumber::Messages::Meta::Product.new(
-          name: RbConfig::CONFIG['target_os'],
-          version: Sys::Uname.uname.version
-        ),
-        cpu: Cucumber::Messages::Meta::Product.new(
-          name: RbConfig::CONFIG['target_cpu']
-        )
+          protocol_version: Cucumber::Messages::VERSION,
+          implementation: Cucumber::Messages::Meta::Product.new(
+              name: tool_name,
+              version: tool_version
+          ),
+          runtime: Cucumber::Messages::Meta::Product.new(
+              name: RUBY_ENGINE,
+              version: RUBY_VERSION
+          ),
+          os: Cucumber::Messages::Meta::Product.new(
+              name: RbConfig::CONFIG['target_os'],
+              version: Sys::Uname.uname.version
+          ),
+          cpu: Cucumber::Messages::Meta::Product.new(
+              name: RbConfig::CONFIG['target_cpu']
+          ),
+          ci: detect_ci(env)
       )
     end
 
@@ -40,14 +42,14 @@ module Cucumber
       return nil if url.nil?
 
       Cucumber::Messages::Meta::CI.new(
-        url: url,
-        name: ci_name,
-        git: Cucumber::Messages::Meta::CI::Git.new(
-          remote: evaluate(ci_system['git']['remote'], env),
-          revision: evaluate(ci_system['git']['revision'], env),
-          branch: evaluate(ci_system['git']['branch'], env),
-          tag: evaluate(ci_system['git']['tag'], env),
-        )
+          url: url,
+          name: ci_name,
+          git: Cucumber::Messages::Meta::CI::Git.new(
+              remote: remove_userinfo_from_url(evaluate(ci_system['git']['remote'], env)),
+              revision: evaluate(ci_system['git']['revision'], env),
+              branch: evaluate(ci_system['git']['branch'], env),
+              tag: evaluate(ci_system['git']['tag'], env),
+          )
       )
     end
 
@@ -79,6 +81,17 @@ module Cucumber
       m[1]
     end
 
-    module_function :create_meta, :detect_ci, :create_ci, :group1, :evaluate
+    def remove_userinfo_from_url(value)
+      return nil if value.nil?
+      begin
+        uri = URI(value)
+        uri.userinfo = ''
+        uri.to_s
+      rescue
+        value
+      end
+    end
+
+    module_function :create_meta, :detect_ci, :create_ci, :group1, :evaluate, :remove_userinfo_from_url
   end
 end

data/spec/cucumber/remove_userinfo_from_url_spec.rb

@@ -0,0 +1,29 @@
+require 'cucumber/create_meta'
+
+describe 'remove_user_info_from_url' do
+  it 'returns nil for nil' do
+    expect(Cucumber::CreateMeta.remove_userinfo_from_url(nil)).to be_nil
+  end
+
+  it 'returns empty string for empty string' do
+    expect(Cucumber::CreateMeta.remove_userinfo_from_url('')).to eq('')
+  end
+
+  it 'leaves the data intact when no sensitive information is detected' do
+    expect(Cucumber::CreateMeta.remove_userinfo_from_url('pretty safe')).to eq('pretty safe')
+  end
+
+  context 'with URLs' do
+    it 'leaves intact when no password is found' do
+      expect(Cucumber::CreateMeta.remove_userinfo_from_url('https://example.com/git/repo.git')).to eq('https://example.com/git/repo.git')
+    end
+
+    it 'removes credentials when found' do
+      expect(Cucumber::CreateMeta.remove_userinfo_from_url('http://login@example.com/git/repo.git')).to eq('http://example.com/git/repo.git')
+    end
+
+    it 'removes credentials and passwords when found' do
+      expect(Cucumber::CreateMeta.remove_userinfo_from_url('ssh://login:password@example.com/git/repo.git')).to eq('ssh://example.com/git/repo.git')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-create-meta
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.3
 platform: ruby
 authors:
 - Vincent Prêtre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-messages
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: 13.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.3.2
+        version: 13.1.0
 - !ruby/object:Gem::Dependency
   name: sys-uname
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +101,7 @@ files:
 - lib/cucumber/create_meta.rb
 - spec/capture_warnings.rb
 - spec/cucumber/create_meta_spec.rb
+- spec/cucumber/remove_userinfo_from_url_spec.rb
 homepage: https://github.com/cucumber/create-meta-ruby
 licenses:
 - MIT
@@ -129,7 +130,8 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-create-meta-1.1.0
+summary: cucumber-create-meta-2.0.3
 test_files:
 - spec/capture_warnings.rb
 - spec/cucumber/create_meta_spec.rb
+- spec/cucumber/remove_userinfo_from_url_spec.rb