appmap 0.33.0 → 0.34.5

data/test/cli_test.rb

@@ -56,10 +56,12 @@ class CLITest < Minitest::Test
     Class frequency:
     ----------------
     1	Main
+    1	IO
 
     Method frequency:
     ----------------
     1	Main.say_hello
+    1	IO#write
     OUTPUT
   end
 
@@ -80,12 +82,20 @@ class CLITest < Minitest::Test
         {
           "name": "Main",
           "count": 1
+        },
+        {
+          "name": "IO",
+          "count": 1
         }
       ],
       "method_frequency": [
         {
           "name": "Main.say_hello",
           "count": 1
+        },
+        {
+          "name": "IO#write",
+          "count": 1
         }
       ]
     }

data/test/fixtures/openssl_recorder/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'appmap', git: 'applandinc/appmap-ruby', branch: `git rev-parse --abbrev-ref HEAD`.strip

data/test/fixtures/openssl_recorder/appmap.yml

@@ -0,0 +1,3 @@
+name: openssl_recorder
+packages:
+  - path: lib

data/test/fixtures/openssl_recorder/lib/openssl_cert_sign.rb

@@ -0,0 +1,94 @@
+# frozen_string_literal: true
+
+# From the manual page https://ruby-doc.org/stdlib-2.5.1/libdoc/openssl/rdoc/OpenSSL.html
+
+require 'openssl'
+
+module Example
+  def Example.sign
+    ca_key = OpenSSL::PKey::RSA.new 2048
+    pass_phrase = 'my secure pass phrase goes here'
+
+    cipher = OpenSSL::Cipher.new 'AES-256-CBC'
+
+    open 'tmp/ca_key.pem', 'w', 0644 do |io|
+      io.write ca_key.export(cipher, pass_phrase)
+    end
+
+    ca_name = OpenSSL::X509::Name.parse '/CN=ca/DC=example'
+
+    ca_cert = OpenSSL::X509::Certificate.new
+    ca_cert.serial = 0
+    ca_cert.version = 2
+    ca_cert.not_before = Time.now
+    ca_cert.not_after = Time.now + 86400
+
+    ca_cert.public_key = ca_key.public_key
+    ca_cert.subject = ca_name
+    ca_cert.issuer = ca_name
+
+    extension_factory = OpenSSL::X509::ExtensionFactory.new
+    extension_factory.subject_certificate = ca_cert
+    extension_factory.issuer_certificate = ca_cert
+
+    ca_cert.add_extension    extension_factory.create_extension('subjectKeyIdentifier', 'hash')
+    ca_cert.add_extension    extension_factory.create_extension('basicConstraints', 'CA:TRUE', true)
+
+    ca_cert.add_extension    extension_factory.create_extension(
+      'keyUsage', 'cRLSign,keyCertSign', true)
+
+    ca_cert.sign ca_key, OpenSSL::Digest::SHA1.new
+
+    open 'tmp/ca_cert.pem', 'w' do |io|
+      io.write ca_cert.to_pem
+    end
+
+    csr = OpenSSL::X509::Request.new
+    csr.version = 0
+    csr.subject = OpenSSL::X509::Name.new([ ['CN', 'the name to sign', OpenSSL::ASN1::UTF8STRING] ])
+    csr.public_key = ca_key.public_key
+    csr.sign ca_key, OpenSSL::Digest::SHA1.new
+
+    open 'tmp/csr.pem', 'w' do |io|
+      io.write csr.to_pem
+    end
+
+    csr = OpenSSL::X509::Request.new File.read 'tmp/csr.pem'
+
+    raise 'CSR can not be verified' unless csr.verify csr.public_key
+
+    csr_cert = OpenSSL::X509::Certificate.new
+    csr_cert.serial = 0
+    csr_cert.version = 2
+    csr_cert.not_before = Time.now
+    csr_cert.not_after = Time.now + 600
+
+    csr_cert.subject = csr.subject
+    csr_cert.public_key = csr.public_key
+    csr_cert.issuer = ca_cert.subject
+
+    extension_factory = OpenSSL::X509::ExtensionFactory.new
+    extension_factory.subject_certificate = csr_cert
+    extension_factory.issuer_certificate = ca_cert
+
+    csr_cert.add_extension    extension_factory.create_extension('basicConstraints', 'CA:FALSE')
+
+    csr_cert.add_extension    extension_factory.create_extension(
+        'keyUsage', 'keyEncipherment,dataEncipherment,digitalSignature')
+
+    csr_cert.add_extension    extension_factory.create_extension('subjectKeyIdentifier', 'hash')
+
+    csr_cert.sign ca_key, OpenSSL::Digest::SHA1.new
+
+    'tmp/csr_cert.pem'.tap do |fname|
+      open fname, 'w' do |io|
+        io.write csr_cert.to_pem
+      end
+    end
+  end
+end
+
+if __FILE__ == $0
+  cert_file = Example.sign
+  puts "Wrote cert file #{cert_file}"
+end

data/test/fixtures/openssl_recorder/lib/openssl_encrypt.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# From the manual page https://ruby-doc.org/stdlib-2.5.1/libdoc/openssl/rdoc/OpenSSL.html
+
+require 'openssl'
+
+module Example
+  def Example.encrypt
+    cipher = OpenSSL::Cipher.new 'AES-256-CBC'
+    cipher.encrypt
+    iv = cipher.random_iv
+
+    pwd = 'some hopefully not to easily guessable password'
+    salt = OpenSSL::Random.random_bytes 16
+    iter = 20000
+    key_len = cipher.key_len
+    digest = OpenSSL::Digest::SHA256.new
+
+    key = OpenSSL::PKCS5.pbkdf2_hmac(pwd, salt, iter, key_len, digest)
+    cipher.key = key
+
+    document = 'the document'
+
+    encrypted = cipher.update document
+    encrypted << cipher.final
+    encrypted
+  end
+end
+
+if __FILE__ == $0
+  ciphertext = Example.encrypt
+  require 'base64'
+  puts "Computed ciphertext #{Base64.urlsafe_encode64(ciphertext)}"
+end

data/test/fixtures/openssl_recorder/lib/openssl_key_sign.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# From the manual page https://ruby-doc.org/stdlib-2.5.1/libdoc/openssl/rdoc/OpenSSL.html
+
+require 'appmap'
+require 'openssl'
+require 'openssl/digest'
+
+module Example
+  def Example.sign
+    key = OpenSSL::PKey::RSA.new 2048
+
+    document = 'the document'
+
+    digest = OpenSSL::Digest::SHA256.new
+    key.sign digest, document
+  end
+end
+
+if __FILE__ == $0
+  appmap = AppMap.record do
+    Example.sign
+    puts 'Computed signature'
+  end
+  appmap['metadata'] = [ 'recorder' => __FILE__ ]
+
+  File.write('appmap.json', JSON.generate(appmap))
+end

data/test/openssl_test.rb

@@ -0,0 +1,203 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'test_helper'
+require 'English'
+
+class OpenSSLTest < Minitest::Test
+  def perform_test(test_name)
+    Bundler.with_clean_env do
+      Dir.chdir 'test/fixtures/openssl_recorder' do
+        FileUtils.rm_rf 'tmp'
+        system 'bundle config --local local.appmap ../../..'
+        system 'bundle'
+        system({ 'APPMAP' => 'true', 'DEBUG' => 'true' }, %(bundle exec ruby lib/openssl_#{test_name}.rb))
+
+        yield
+      end
+    end
+  end
+
+  def test_key_sign
+    perform_test 'key_sign' do
+      appmap_file = 'appmap.json'
+
+      assert File.file?(appmap_file), 'appmap output file does not exist'
+      appmap = JSON.parse(File.read(appmap_file))
+      assert_equal AppMap::APPMAP_FORMAT_VERSION, appmap['version']
+      assert_equal [ { 'recorder' => 'lib/openssl_key_sign.rb' } ], appmap['metadata']
+      assert_equal JSON.parse(<<~JSON), appmap['classMap']
+      [
+        {
+          "name": "lib",
+          "type": "package",
+          "children": [
+            {
+              "name": "Example",
+              "type": "class",
+              "children": [
+                {
+                  "name": "sign",
+                  "type": "function",
+                  "location": "lib/openssl_key_sign.rb:10",
+                  "static": true
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "openssl",
+          "type": "package",
+          "children": [
+            {
+              "name": "OpenSSL",
+              "type": "class",
+              "children": [
+                {
+                  "name": "PKey",
+                  "type": "class",
+                  "children": [
+                    {
+                      "name": "PKey",
+                      "type": "class",
+                      "children": [
+                        {
+                          "name": "sign",
+                          "type": "function",
+                          "location": "OpenSSL::PKey::PKey#sign",
+                          "static": false,
+                          "labels": [
+                            "security",
+                            "crypto"
+                          ]
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "name": "io",
+          "type": "package",
+          "children": [
+            {
+              "name": "IO",
+              "type": "class",
+              "children": [
+                {
+                  "name": "write",
+                  "type": "function",
+                  "location": "IO#write",
+                  "static": false,
+                  "labels": [
+                    "io"
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+      JSON
+      sanitized_events = appmap['events'].map(&:deep_symbolize_keys).map(&AppMap::Util.method(:sanitize_event)).map do |event|
+        delete_value = ->(obj) { (obj || {}).delete(:value) }
+        delete_value.call(event[:receiver])
+        delete_value.call(event[:return_value])
+        event
+      end
+
+      diff = Diffy::Diff.new(<<~JSON.strip, JSON.pretty_generate(sanitized_events).strip)
+      [
+        {
+          "id": 1,
+          "event": "call",
+          "defined_class": "Example",
+          "method_id": "sign",
+          "path": "lib/openssl_key_sign.rb",
+          "lineno": 10,
+          "static": true,
+          "parameters": [
+      
+          ],
+          "receiver": {
+            "class": "Module"
+          }
+        },
+        {
+          "id": 2,
+          "event": "call",
+          "defined_class": "OpenSSL::PKey::PKey",
+          "method_id": "sign",
+          "path": "OpenSSL::PKey::PKey#sign",
+          "static": false,
+          "parameters": [
+            {
+              "name": "arg",
+              "class": "OpenSSL::Digest::SHA256",
+              "value": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+              "kind": "req"
+            },
+            {
+              "name": "arg",
+              "class": "String",
+              "value": "the document",
+              "kind": "req"
+            }
+          ],
+          "receiver": {
+            "class": "OpenSSL::PKey::RSA"
+          }
+        },
+        {
+          "id": 3,
+          "event": "return",
+          "parent_id": 2,
+          "return_value": {
+            "class": "String"
+          }
+        },
+        {
+          "id": 4,
+          "event": "return",
+          "parent_id": 1,
+          "return_value": {
+            "class": "String"
+          }
+        },
+        {
+          "id": 5,
+          "event": "call",
+          "defined_class": "IO",
+          "method_id": "write",
+          "path": "IO#write",
+          "static": false,
+          "parameters": [
+            {
+              "name": "arg",
+              "class": "String",
+              "value": "Computed signature",
+              "kind": "rest"
+            }
+          ],
+          "receiver": {
+            "class": "IO"
+          }
+        },
+        {
+          "id": 6,
+          "event": "return",
+          "parent_id": 5,
+          "return_value": {
+            "class": "Integer"
+          }
+        }
+      ]
+      JSON
+      assert_equal '', diff.to_s
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appmap
 version: !ruby/object:Gem::Version
-  version: 0.33.0
+  version: 0.34.5
 platform: ruby
 authors:
 - Kevin Gilpin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-15 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement
@@ -248,16 +262,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - kgilpin@gmail.com
 executables:
 - appmap
-extensions: []
+extensions:
+- ext/appmap/extconf.rb
 extra_rdoc_files: []
 files:
 - ".dockerignore"
 - ".gitignore"
+- ".rbenv-gemsets"
 - ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
@@ -277,6 +321,8 @@ files:
 - examples/mock_webapp/lib/mock_webapp/request.rb
 - examples/mock_webapp/lib/mock_webapp/user.rb
 - exe/appmap
+- ext/appmap/appmap.c
+- ext/appmap/extconf.rb
 - lib/appmap.rb
 - lib/appmap/algorithm/prune_class_map.rb
 - lib/appmap/algorithm/stats.rb
@@ -503,6 +549,11 @@ files:
 - test/fixtures/minitest_recorder/appmap.yml
 - test/fixtures/minitest_recorder/lib/hello.rb
 - test/fixtures/minitest_recorder/test/hello_test.rb
+- test/fixtures/openssl_recorder/Gemfile
+- test/fixtures/openssl_recorder/appmap.yml
+- test/fixtures/openssl_recorder/lib/openssl_cert_sign.rb
+- test/fixtures/openssl_recorder/lib/openssl_encrypt.rb
+- test/fixtures/openssl_recorder/lib/openssl_key_sign.rb
 - test/fixtures/process_recorder/appmap.yml
 - test/fixtures/process_recorder/hello.rb
 - test/fixtures/rspec_recorder/Gemfile
@@ -512,6 +563,7 @@ files:
 - test/fixtures/rspec_recorder/spec/labeled_hello_spec.rb
 - test/fixtures/rspec_recorder/spec/plain_hello_spec.rb
 - test/minitest_test.rb
+- test/openssl_test.rb
 - test/record_process_test.rb
 - test/rspec_test.rb
 - test/test_helper.rb