From 0a5db83ea0579e6789bda9bfebf9c3b8c91bf85f Mon Sep 17 00:00:00 2001 From: Daniel55 Date: Fri, 6 Jan 2023 10:55:38 +0800 Subject: [PATCH] Revert "Refactor signature spec" --- Gemfile.lock | 18 ---- spec/signature_spec.rb | 184 ++++++++++++++++++++++------------------- spec/spec_helper.rb | 1 - ssh_data.gemspec | 1 - 4 files changed, 99 insertions(+), 105 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5054539..f464a73 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,18 +6,10 @@ PATH GEM remote: https://rubygems.org/ specs: - ast (2.4.2) - binding_ninja (0.2.3) coderay (1.1.3) diff-lcs (1.4.4) ed25519 (1.2.4) method_source (1.0.0) - parser (3.1.2.0) - ast (~> 2.4.1) - proc_to_ast (0.1.0) - coderay - parser - unparser pry (0.14.0) coderay (~> 1.1) method_source (~> 1.0) @@ -33,16 +25,7 @@ GEM rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-parameterized (0.5.0) - binding_ninja (>= 0.2.3) - parser - proc_to_ast - rspec (>= 2.13, < 4) - unparser rspec-support (3.10.2) - unparser (0.6.5) - diff-lcs (~> 1.3) - parser (>= 3.1.0) PLATFORMS ruby @@ -52,7 +35,6 @@ DEPENDENCIES pry (~> 0.14) rspec (~> 3.10) rspec-mocks (~> 3.10) - rspec-parameterized (~> 0.5) ssh_data! BUNDLED WITH diff --git a/spec/signature_spec.rb b/spec/signature_spec.rb index 61e0773..0011167 100644 --- a/spec/signature_spec.rb +++ b/spec/signature_spec.rb @@ -1,87 +1,74 @@ require_relative "./spec_helper" describe SSHData::Signature do - def read_fixture_file(name) - fixture_file_path = File.join("spec/fixtures/signatures", name) - File.read(fixture_file_path) - end - - let(:name) { File.basename(path) } - let(:signature) { File.read(path) } - let(:message) { read_fixture_file("message") } - - subject { described_class.parse_pem(signature) } - describe "end to end" do - context "with an Ed25519-SK git signature" do - let(:message) { "tree ed9f16d32a89e48289d9d4becc4ff47cbd11f58c\nparent 7c6364502eceecc87b276d8b49d8eb0ae96fd9e3\nauthor Kevin Jones 1638815753 -0500\ncommitter Kevin Jones 1638815828 -0500\n\ntest\n" } + it "can verify an Ed25519-SK git signature" do + message= "tree ed9f16d32a89e48289d9d4becc4ff47cbd11f58c\nparent 7c6364502eceecc87b276d8b49d8eb0ae96fd9e3\nauthor Kevin Jones 1638815753 -0500\ncommitter Kevin Jones 1638815828 -0500\n\ntest\n" + signature = <<~SIG + -----BEGIN SSH SIGNATURE----- + U1NIU0lHAAAAAQAAAEoAAAAac2stc3NoLWVkMjU1MTlAb3BlbnNzaC5jb20AAAAgnXUo8l + URoToCMzr+Rxeia/9yy+Rn+VwTTOqXdIgf7TUAAAAEc3NoOgAAAANnaXQAAAAAAAAABnNo + YTUxMgAAAGcAAAAac2stc3NoLWVkMjU1MTlAb3BlbnNzaC5jb20AAABAud+P+aC7yCEcgy + smyAyN5iokI0T+dKuhl7Ml7XB/wPBlefSamMXoHE7k3BbAXBNXJQH0TtHo/aX0gZxLy44D + DgUAAAAG + -----END SSH SIGNATURE----- + SIG - let(:signature) do - <<~SIG - -----BEGIN SSH SIGNATURE----- - U1NIU0lHAAAAAQAAAEoAAAAac2stc3NoLWVkMjU1MTlAb3BlbnNzaC5jb20AAAAgnXUo8l - URoToCMzr+Rxeia/9yy+Rn+VwTTOqXdIgf7TUAAAAEc3NoOgAAAANnaXQAAAAAAAAABnNo - YTUxMgAAAGcAAAAac2stc3NoLWVkMjU1MTlAb3BlbnNzaC5jb20AAABAud+P+aC7yCEcgy - smyAyN5iokI0T+dKuhl7Ml7XB/wPBlefSamMXoHE7k3BbAXBNXJQH0TtHo/aX0gZxLy44D - DgUAAAAG - -----END SSH SIGNATURE----- - SIG - end - - - it "verifies the message" do - expect(subject.verify(message)).to be(true) - end + subject = described_class.parse_pem(signature) + expect(subject.verify(message)).to be(true) end - context 'with an RSA git signature' do - let(:message) { "tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904\nparent 339ca5fd2a41e29236ea793772308bb054b9d81b\nauthor Kevin Jones 1637774236 -0500\ncommitter Kevin Jones 1637774236 -0500\n\nWHAT\n" } + it "can verify an RSA git signature" do + message = "tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904\nparent 339ca5fd2a41e29236ea793772308bb054b9d81b\nauthor Kevin Jones 1637774236 -0500\ncommitter Kevin Jones 1637774236 -0500\n\nWHAT\n" + signature = <<~SIG + -----BEGIN SSH SIGNATURE----- + U1NIU0lHAAAAAQAAAZcAAAAHc3NoLXJzYQAAAAMBAAEAAAGBANEwkDjsYE02vY+bTFXAL9 + xaGDFRwpAYutfhl7eL1Qn6dziGnokqMz1FnwPbRkPUOtdwXbojK0W45DS8rODLhvwyEJjj + sY2L9pKX/6hKDgb1RjtNAv57OHnfW3qyZWM/Nyd5js9K+43JN1ECoWCTVqtAaJcyfNXY8Y + FeR6x5ARkBZf+tgPA2+xIdmDf0jxyZ+hr6LRnE6/N9WsrCURnwx3u8XE8kusudBXDD4XKp + F/AqptHwi6OML+9kRQmyXXYs1dvPaJi4TGAGlPPD7mQaWT9fsKXJZa3jl6ckzq6D7SDDPh + CF2e/ZpzIJuusMQrx2snhKgKYh+G4WS/FpLcan+HG+/bv91lzNBXufJSLs5oo0B13L6ZaK + CJMkzG4zo/evDiomkXv9Fg8f2bIw2Ayh56Cd4Dcc2MYfziG3yLiVQrDu2eCTuILYzYdcFw + hzxkS8V6Ep+9U4ct0Zt+hTpyloSnQ7AEX/FKHAT7xdQxVoYaY7cVRyOWMROQ6ArxiNbPnk + JQAAAANnaXQAAAAAAAAABnNoYTUxMgAAAZQAAAAMcnNhLXNoYTItNTEyAAABgKE+f+H3D1 + +kgPGi1TulPivysng0PIUthoVHSpJ5OKd2VrbdiH5B/XK1DmhpxCFVy6WAKD/x7a6Qpjd2 + VSVsKdtJeBLfniTWB/LJQD/5miEVBG10F9V5EaEl4uRiQrTTGEAznBg3k0yIUVBdWWjoJh + 5dLw+NQNWf9yw+/hNbtcCjkMeeZLvLwZNhsFxhRiIi5cy5m6O/eSSekaXe4sj0HxmuSIwh + 8bFRlU+JQwmJ5P1tsnyhwaSSs5qnJ0MXiDeLD5MOt9PGDJhnNarMqYkA61slhhq1XkQu1E + FXdurNLkKaTpViSlFXqjFGXgoyB8yWB9DuqoZm69xGtCh1TmKkyE3M2R6hqXTqc90Szkxr + POr3R0OsJrYu1VOc//AKz7AHp1DGHOTNZkpfYVzm76wrkPS9LMVieZkelcr75/az+w6kev + qi1HNSYwD+pWej8+oCw6jri/ulGHDYyARR4ZSIR2AgBP5QZ0B0aLNr5F9ufbJvkGEpUvQH + rfqicASU/vCBEQ== + -----END SSH SIGNATURE----- + SIG - let(:signature) do - <<~SIG - -----BEGIN SSH SIGNATURE----- - U1NIU0lHAAAAAQAAAZcAAAAHc3NoLXJzYQAAAAMBAAEAAAGBANEwkDjsYE02vY+bTFXAL9 - xaGDFRwpAYutfhl7eL1Qn6dziGnokqMz1FnwPbRkPUOtdwXbojK0W45DS8rODLhvwyEJjj - sY2L9pKX/6hKDgb1RjtNAv57OHnfW3qyZWM/Nyd5js9K+43JN1ECoWCTVqtAaJcyfNXY8Y - FeR6x5ARkBZf+tgPA2+xIdmDf0jxyZ+hr6LRnE6/N9WsrCURnwx3u8XE8kusudBXDD4XKp - F/AqptHwi6OML+9kRQmyXXYs1dvPaJi4TGAGlPPD7mQaWT9fsKXJZa3jl6ckzq6D7SDDPh - CF2e/ZpzIJuusMQrx2snhKgKYh+G4WS/FpLcan+HG+/bv91lzNBXufJSLs5oo0B13L6ZaK - CJMkzG4zo/evDiomkXv9Fg8f2bIw2Ayh56Cd4Dcc2MYfziG3yLiVQrDu2eCTuILYzYdcFw - hzxkS8V6Ep+9U4ct0Zt+hTpyloSnQ7AEX/FKHAT7xdQxVoYaY7cVRyOWMROQ6ArxiNbPnk - JQAAAANnaXQAAAAAAAAABnNoYTUxMgAAAZQAAAAMcnNhLXNoYTItNTEyAAABgKE+f+H3D1 - +kgPGi1TulPivysng0PIUthoVHSpJ5OKd2VrbdiH5B/XK1DmhpxCFVy6WAKD/x7a6Qpjd2 - VSVsKdtJeBLfniTWB/LJQD/5miEVBG10F9V5EaEl4uRiQrTTGEAznBg3k0yIUVBdWWjoJh - 5dLw+NQNWf9yw+/hNbtcCjkMeeZLvLwZNhsFxhRiIi5cy5m6O/eSSekaXe4sj0HxmuSIwh - 8bFRlU+JQwmJ5P1tsnyhwaSSs5qnJ0MXiDeLD5MOt9PGDJhnNarMqYkA61slhhq1XkQu1E - FXdurNLkKaTpViSlFXqjFGXgoyB8yWB9DuqoZm69xGtCh1TmKkyE3M2R6hqXTqc90Szkxr - POr3R0OsJrYu1VOc//AKz7AHp1DGHOTNZkpfYVzm76wrkPS9LMVieZkelcr75/az+w6kev - qi1HNSYwD+pWej8+oCw6jri/ulGHDYyARR4ZSIR2AgBP5QZ0B0aLNr5F9ufbJvkGEpUvQH - rfqicASU/vCBEQ== - -----END SSH SIGNATURE----- - SIG - end - - it "verifies the message" do - expect(subject.verify(message)).to be(true) - end + subject = described_class.parse_pem(signature) + expect(subject.verify(message)).to be(true) end end describe "#verify" do - where(:path) { Dir["spec/fixtures/signatures/message.*no-options-individual.sig"] } - with_them do - describe do + Dir["spec/fixtures/signatures/message.*no-options-individual.sig"].each do |path| + name = File.basename(path) + + describe name do + let(:signature) { File.read(path) } + let(:data) { File.read("spec/fixtures/signatures/message") } + it "verifies with data" do - expect(subject.verify(message)).to be(true) + subject = described_class.parse_pem(signature) + expect(subject.verify(data)).to be(true) end it "does not verify with tampered data" do - bad_data = message + "bad" + bad_data = data + "bad" + subject = described_class.parse_pem(signature) expect(subject.verify(bad_data)).to be(false) end it "parses correctly" do + subject = described_class.parse_pem(signature) expect(subject.sigversion).to eq(1) expect(subject.namespace).to eq("file") expect(subject.reserved).to be_empty @@ -93,57 +80,75 @@ describe SSHData::Signature do end describe "#verify security keys" do - where(:path) { Dir["spec/fixtures/signatures/message.*-sk-*no-options-individual.sig"] } + Dir["spec/fixtures/signatures/message.*-sk-*no-options-individual.sig"].each do |path| + name = File.basename(path) + + describe name do + let(:signature) { File.read(path) } + let(:data) { File.read("spec/fixtures/signatures/message") } - with_them do - describe do it "does not verify if user verification is required" do - expect(subject.verify(message, user_verification_required: true)).to be(false) + subject = described_class.parse_pem(signature) + expect(subject.verify(data, user_verification_required: true)).to be(false) end end end end describe "#verify no-touch" do - where(:path) { Dir["spec/fixtures/signatures/message.*no-touch-required-individual.sig"] } + Dir["spec/fixtures/signatures/message.*no-touch-required-individual.sig"].each do |path| + name = File.basename(path) + + describe name do + let(:signature) { File.read(path) } + let(:data) { File.read("spec/fixtures/signatures/message") } - with_them do - describe do it "verifies with data" do - expect(subject.verify(message, user_presence_required: false)).to be(true) + subject = described_class.parse_pem(signature) + expect(subject.verify(data, user_presence_required: false)).to be(true) end it "does not verify with tampered data" do - bad_data = message + "bad" + bad_data = data + "bad" + subject = described_class.parse_pem(signature) expect(subject.verify(bad_data, user_presence_required: false)).to be(false) end it "does not verify with user presence" do - expect(subject.verify(message, user_presence_required: true)).to be(false) + subject = described_class.parse_pem(signature) + expect(subject.verify(data, user_presence_required: true)).to be(false) end it "does not verify with user presence by default" do - expect(subject.verify(message)).to be(false) + subject = described_class.parse_pem(signature) + expect(subject.verify(data)).to be(false) end it "errors on unknown verify options" do - expect { subject.verify(message, potato: :no) }.to raise_error(SSHData::UnsupportedError) + subject = described_class.parse_pem(signature) + expect { subject.verify(data, potato: :no) }.to raise_error(SSHData::UnsupportedError) end end end end describe "#verify verify-required" do - where(:path) { Dir["spec/fixtures/signatures/message.*verify-required-individual.sig"] } - with_them do - describe do + Dir["spec/fixtures/signatures/message.*verify-required-individual.sig"].each do |path| + name = File.basename(path) + + describe name do + let(:signature) { File.read(path) } + let(:data) { File.read("spec/fixtures/signatures/message") } + it "verifies with data" do - expect(subject.verify(message, user_verification_required: true)).to be(true) + subject = described_class.parse_pem(signature) + expect(subject.verify(data, user_verification_required: true)).to be(true) end it "does not verify with tampered data" do - bad_data = message + "bad" + bad_data = data + "bad" + subject = described_class.parse_pem(signature) expect(subject.verify(bad_data, user_verification_required: true)).to be(false) end end @@ -151,11 +156,16 @@ describe SSHData::Signature do end describe "#verify certificates" do - where(:path) { Dir["spec/fixtures/signatures/message.*no-options-certificate.sig"] } - with_them do - describe do + Dir["spec/fixtures/signatures/message.*no-options-certificate.sig"].each do |path| + name = File.basename(path) + + describe name do + let(:signature) { File.read(path) } + let(:data) { File.read("spec/fixtures/signatures/message") } + it "parses correctly" do + subject = described_class.parse_pem(signature) expect(subject.sigversion).to eq(1) expect(subject.namespace).to eq("file") expect(subject.reserved).to be_empty @@ -164,14 +174,18 @@ describe SSHData::Signature do end it "verifies with data" do - expect(subject.verify(message)).to be(true) + subject = described_class.parse_pem(signature) + expect(subject.verify(data)).to be(true) end it "does not verify with tampered data" do - bad_data = message + "bad" + bad_data = data + "bad" + subject = described_class.parse_pem(signature) expect(subject.verify(bad_data)).to be(false) end + end end end + end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 4d49d4d..6e1b295 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,6 +1,5 @@ require "ssh_data" require "ed25519" -require "rspec-parameterized" RSpec.configure do |config| config.color_mode = :off diff --git a/ssh_data.gemspec b/ssh_data.gemspec index 332e010..aa85ee1 100644 --- a/ssh_data.gemspec +++ b/ssh_data.gemspec @@ -15,6 +15,5 @@ Gem::Specification.new do |s| s.add_development_dependency "ed25519", "~> 1.2" s.add_development_dependency "pry", "~> 0.14" s.add_development_dependency "rspec", "~> 3.10" - s.add_development_dependency "rspec-parameterized", "~> 0.5" s.add_development_dependency "rspec-mocks", "~> 3.10" end