appmap 0.31.0 → 0.34.2

data/spec/open_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe AppMap::Open do
+  context 'a block of Ruby code' do
+    it 'opens in the browser' do
+      appmap = AppMap.record do
+        File.read __FILE__
+      end
+
+      open = AppMap::Open.new(appmap)
+      server = open.run_server
+      page = Net::HTTP.get URI.parse("http://localhost:#{open.port}")
+      expect(page).to include(%(name="data" value='{"version))
+      server.kill
+    end
+  end
+end

data/spec/record_sql_rails_pg_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_spec_helper'
 
-describe 'Record SQL queries in a Rails app' do
+describe 'SQL events' do
   before(:all) { @fixture_dir = 'spec/fixtures/rails_users_app' }
   include_context 'Rails app pg database'
 
@@ -14,54 +14,77 @@ describe 'Record SQL queries in a Rails app' do
   end
 
   let(:tmpdir) { "tmp/spec/record_sql_rails_pg_spec" }
-  let(:appmap) { JSON.parse(File.read(appmap_json)).to_yaml }
 
-  context 'while creating a new record' do
+  describe 'fields' do
     let(:test_line_number) { 8 }
     let(:appmap_json) { File.join(tmpdir, 'appmap/rspec/Api_UsersController_POST_api_users_with_required_parameters_creates_a_user.appmap.json') }
+    let(:orm_module) { 'sequel' }
+    let(:appmap) { JSON.parse(File.read(appmap_json)) }
+    describe 'on a call event' do
+      let(:event) do
+        appmap['events'].find do |event|
+          event['event'] == 'call' &&
+            event.keys.include?('sql_query')
+        end
+      end
+      it 'do not include function-only fields' do
+        expect(event.keys).to_not include('defined_class')
+        expect(event.keys).to_not include('method_id')
+        expect(event.keys).to_not include('path')
+        expect(event.keys).to_not include('lineno')
+      end
+    end
+  end
+
+  describe 'in a Rails app' do
+    let(:appmap) { JSON.parse(File.read(appmap_json)).to_yaml }
+    context 'while creating a new record' do
+      let(:test_line_number) { 8 }
+      let(:appmap_json) { File.join(tmpdir, 'appmap/rspec/Api_UsersController_POST_api_users_with_required_parameters_creates_a_user.appmap.json') }
 
-    context 'using Sequel ORM' do
-      let(:orm_module) { 'sequel' }
-      it 'detects the sql INSERT' do
-        expect(appmap).to include(<<-SQL_QUERY.strip)
+      context 'using Sequel ORM' do
+        let(:orm_module) { 'sequel' }
+        it 'detects the sql INSERT' do
+          expect(appmap).to include(<<-SQL_QUERY.strip)
   sql_query:
     sql: INSERT INTO "users" ("login") VALUES ('alice') RETURNING *
-        SQL_QUERY
+          SQL_QUERY
+        end
       end
-    end
-    context 'using ActiveRecord ORM' do
-      let(:orm_module) { 'activerecord' }
-      it 'detects the sql INSERT' do
-        expect(appmap).to include(<<-SQL_QUERY.strip)
+      context 'using ActiveRecord ORM' do
+        let(:orm_module) { 'activerecord' }
+        it 'detects the sql INSERT' do
+          expect(appmap).to include(<<-SQL_QUERY.strip)
   sql_query:
     sql: INSERT INTO "users" ("login") VALUES ($1) RETURNING "id"
-        SQL_QUERY
+          SQL_QUERY
+        end
       end
     end
-  end
-
-  context 'while listing records' do
-    let(:test_line_number) { 23 }
-    let(:appmap_json) { File.join(tmpdir, 'appmap/rspec/Api_UsersController_GET_api_users_lists_the_users.appmap.json') }
-
-    context 'using Sequel ORM' do
-      let(:orm_module) { 'sequel' }
-      it 'detects the sql SELECT' do
-        expect(appmap).to include(<<-SQL_QUERY.strip)
+  
+    context 'while listing records' do
+      let(:test_line_number) { 23 }
+      let(:appmap_json) { File.join(tmpdir, 'appmap/rspec/Api_UsersController_GET_api_users_lists_the_users.appmap.json') }
+  
+      context 'using Sequel ORM' do
+        let(:orm_module) { 'sequel' }
+        it 'detects the sql SELECT' do
+          expect(appmap).to include(<<-SQL_QUERY.strip)
   sql_query:
     sql: SELECT * FROM "users"
-        SQL_QUERY
-
-        expect(appmap).to include('sql:')
+          SQL_QUERY
+  
+          expect(appmap).to include('sql:')
+        end
       end
-    end
-    context 'using ActiveRecord ORM' do
-      let(:orm_module) { 'activerecord' }
-      it 'detects the sql SELECT' do
-        expect(appmap).to include(<<-SQL_QUERY.strip)
+      context 'using ActiveRecord ORM' do
+        let(:orm_module) { 'activerecord' }
+        it 'detects the sql SELECT' do
+          expect(appmap).to include(<<-SQL_QUERY.strip)
   sql_query:
     sql: SELECT "users".* FROM "users"
-        SQL_QUERY
+          SQL_QUERY
+        end
       end
     end
   end

data/test/cli_test.rb

@@ -55,11 +55,13 @@ class CLITest < Minitest::Test
     assert_equal <<~OUTPUT.strip, output.strip
     Class frequency:
     ----------------
-    2	Main
+    1	Main
+    1	IO
 
     Method frequency:
     ----------------
     1	Main.say_hello
+    1	IO#write
     OUTPUT
   end
 
@@ -79,13 +81,21 @@ class CLITest < Minitest::Test
       "class_frequency": [
         {
           "name": "Main",
-          "count": 2
+          "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/{spec/fixtures/hook/openssl_sign.rb → test/fixtures/openssl_recorder/lib/openssl_cert_sign.rb}

@@ -4,8 +4,8 @@
 
 require 'openssl'
 
-module OpenSSLExample
-  def OpenSSLExample.example
+module Example
+  def Example.sign
     ca_key = OpenSSL::PKey::RSA.new 2048
     pass_phrase = 'my secure pass phrase goes here'
 
@@ -80,8 +80,15 @@ module OpenSSLExample
 
     csr_cert.sign ca_key, OpenSSL::Digest::SHA1.new
 
-    open 'tmp/csr_cert.pem', 'w' do |io|
-      io.write csr_cert.to_pem
+    '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