cucumber-create-meta 1.0.0 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc6fadee5d6df3e7e90f5f21741bd7eb9850b645efa7b120098329932dc9f165
-  data.tar.gz: 8e9553277de8b14d988529b320489685c9a104f60a31a6adf35160ed751e9e76
+  metadata.gz: 4a4f36daf37f233cc900ef6e7e9b962dc8109d1054faecf1de72e532a59335ff
+  data.tar.gz: 0c1fe89598d1eedb5914ac7f8fea417a03c59f6a5b901ef503542fb7695ea675
 SHA512:
-  metadata.gz: cf282b4a220dfb292340b9d216b379a46094ca932d30227382a94f3ec14fca86025504d74f8c334903ff354818ea94b82d7515966ee2550c2d185ca4377dfeb9
-  data.tar.gz: cc3c3328c0c32dc453f2dd5d4fd4a5821aa8ec09fd7e3a4ddeca96b059dea802d6aabf29dee78270c0079acf21272707af9b516d0a5b45066a5f2fefd11c75f0
+  metadata.gz: 7141737ea7d22b1bc7e78f282c0e589eb4c12fc9bfc793b99f75efe69119e5392beb2660d3ce87839e553b917c5a47967777db5eb26cb3ab40740b9dd328cb91
+  data.tar.gz: 7aa043622a0c97318e8abe92941e41a82071e3fecae213962e7a99c437d4bd16dfb34bd4e7b7d71e98788bcbf66da11242002d5bff094682e936cc396a879a10

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.0.0
+  version: 2.0.2
 platform: ruby
 authors:
 - Vincent Prêtre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-29 00:00:00.000000000 Z
+date: 2020-09-03 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.2'
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.2.0
+        version: 13.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.2'
+        version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.2.0
+        version: 13.0.1
 - !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.0.0
+summary: cucumber-create-meta-2.0.2
 test_files:
 - spec/cucumber/create_meta_spec.rb
+- spec/cucumber/remove_userinfo_from_url_spec.rb
 - spec/capture_warnings.rb