Updates handling of arm for both PostgreSQL and MySQL

rapid7 · Apr 19, 2024 · b83f2e3 · b83f2e3
1 parent c694522
commit b83f2e3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/lib/postgres/postgres-pr/connection.rb b/lib/postgres/postgres-pr/connection.rb
@@ -190,7 +190,11 @@ def map_compile_arch_to_architecture(compile_arch)
     elsif compile_arch.include?('ppc')
       arch = ARCH_PPC
     elsif compile_arch.match?('arm')
-      arch = ARCH_ARMLE
+      if compile_arch.match?('64')
+        arch = ARCH_AARCH64
+      elsif compile_arch.match?('arm')
+        arch = ARCH_ARMLE
+      end
     elsif compile_arch.match?('64')
       arch = ARCH_X86_64
     elsif compile_arch.match?('86') || compile_arch.match?('i686')
@@ -209,7 +213,7 @@ def map_compile_arch_to_architecture(compile_arch)
   def detect_platform_and_arch
     result = {}
 
-    query_result = query('select version()').rows.join.match(/on (?<architecture>\w+)-\w+-(?<platform>\w+)-\w+/)
+    query_result = query('select version()').rows.join.match(/on (?<architecture>\w+)-\w+-(?<platform>\w+)/)
     server_vars = {
       'version_compile_machine' => query_result[:architecture],
       'version_compile_os' => query_result[:platform]

diff --git a/lib/rex/proto/mysql/client.rb b/lib/rex/proto/mysql/client.rb
@@ -65,7 +65,11 @@ def map_compile_arch_to_architecture(compile_arch)
               arch = ARCH_SPARC
             end
           elsif compile_arch.match?('arm')
-            arch = ARCH_AARCH64
+            if compile_arch.match?('64')
+              arch = ARCH_AARCH64
+            elsif compile_arch.match?('arm')
+              arch = ARCH_ARMLE
+            end
           elsif compile_arch.match?('64')
             arch = ARCH_X86_64
           elsif compile_arch.match?('86') || compile_arch.match?('i686')

diff --git a/spec/lib/rex/proto/mysql/client_spec.rb b/spec/lib/rex/proto/mysql/client_spec.rb
@@ -65,7 +65,7 @@
       { info: '86', expected: ARCH_X86 },
       { info: 'i686', expected: ARCH_X86 },
       { info: 'arm64', expected: ARCH_AARCH64 },
-      { info: 'arm', expected: ARCH_AARCH64 },
+      { info: 'arm', expected: ARCH_ARMLE },
       { info: 'sparc', expected: ARCH_SPARC },
       { info: 'sparc64', expected: ARCH_SPARC64 },
       { info: '', expected: '' },

diff --git a/spec/lib/rex/proto/postgresql/client_spec.rb b/spec/lib/rex/proto/postgresql/client_spec.rb
@@ -68,6 +68,7 @@
     [
       { version: 'PostgreSQL 9.4.26 on x86_64-pc-linux-gnu (Debian 9.4.26-1.pgdg90+1), compiled by gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516, 64-bit', expected: { arch: 'x86_64', platform: 'Linux' } },
       { version: 'PostgreSQL 14.11 (Debian 14.11-1.pgdg120+2) on x86_64-pc-linux-gnu, compiled by gcc (Debian 12.2.0-14) 12.2.0, 64-bit', expected: { arch: 'x86_64', platform: 'Linux' } },
+      { version: 'PostgreSQL 14.11 (Homebrew) on x86_64-apple-darwin22.6.0, compiled by Apple clang version 15.0.0 (clang-1500.1.0.2.5), 64-bit', expected: { arch: 'x86_64', platform: 'OSX' } }
     ].each do |test|
       context "when the database is version #{test[:version]}" do
         it "returns #{test[:expected]}" do