sparoid 1.0.22 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71a3d6d8370df36acaad83f5f03c0b29c6e5037856c33fcfa3e17a16c6f678ac
-  data.tar.gz: d1d2cd45e4c503af8e0390c5466ec113abfbbeab62a045d3edee274ac888557d
+  metadata.gz: c24825e92fdb072067eb45465af26badb031dae413445c2acb4ec979bfe4afaf
+  data.tar.gz: e77fe5c9f7ad1c014534a51420bd9d1144f8f5fadbbcc1f28fcc8d4c0d52cf2c
 SHA512:
-  metadata.gz: e45e3482c4c500914b12764ea4f1a16e0bde44a4de1119b3b6884a2ba29264de0ad8be169d1c24e3be5c43c8da891d55177491e13229184000fb68b284857487
-  data.tar.gz: c52b06c69dc47867a73a3178172bf2279840ac3228fb74ace9a3fde7159b2e0af26af39d0c86dcba423c4f6ceb2f50fd5fe511072f9a2be3a00665883899e8f3
+  metadata.gz: 8ded4f653d9e8526b3dc4cfe6391deb2df878dd004f7e5c7c694514f251efc865e992f6a0779fa50be7cfeeb88d92b82a982f3de98a89e020e8062b7fcd8b77a
+  data.tar.gz: eb545dc80266d74df92a228b09266f33edf0a9612715196d82282a6bb506ece3bf62cb361a0523516a5e7d1af9e989c1ee606e3212d7471c0b8f9daea318571e

data/.github/workflows/main.yml

@@ -1,18 +1,22 @@
 name: Ruby
 
-on: [push,pull_request]
+on:
+  push:
+    branches:
+      - main
+  pull_request:
 
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.7, '3.0', 3.1, ruby-head ]
+        ruby: [ 2.7, 3.1, 3.2, 3.3, ruby-head ]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - run: bundle install
+        bundler-cache: true
     - run: bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.2.0] - 2024-07-24
+
+- Lookup public IP using http://checkip.amazonaws.com, as it's more reliable for IPv6 connections than the DNS method
+
+## [1.1.0] - 2023-03-03
+
+- Allow override of public ip, open for someone else by passing `:open_for_ip` to `Sparoid.auth(..., open_for_ip:)` (#11)
+
 ## [1.0.22] - 2023-02-01
 
 - Fix `Addrinfo SocketError` should raise `Sparoid::ResolvError` (#10)

data/CODEOWNERS

@@ -0,0 +1 @@
+* @84codes/server

data/lib/sparoid/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sparoid
-  VERSION = "1.0.22"
+  VERSION = "1.2.0"
 end

data/lib/sparoid.rb

@@ -12,10 +12,10 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
   SPAROID_CACHE_PATH = ENV.fetch("SPAROID_CACHE_PATH", "/tmp/.sparoid_public_ip")
 
   # Send an authorization packet
-  def auth(key, hmac_key, host, port)
+  def auth(key, hmac_key, host, port, open_for_ip: cached_public_ip)
     addrs = resolve_ip_addresses(host, port)
-
-    msg = message(cached_public_ip)
+    ip = Resolv::IPv4.create(open_for_ip)
+    msg = message(ip)
     data = prefix_hmac(hmac_key, encrypt(key, msg))
     sendmsg(addrs, data)
 
@@ -149,9 +149,21 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
     end
   end
 
-  def public_ip
-    Resolv::DNS.open(nameserver: ["208.67.222.222", "208.67.220.220"]) do |dns|
-      dns.getresource("myip.opendns.com", Resolv::DNS::Resource::IN::A).address
+  def public_ip(host = "checkip.amazonaws.com", port = 80) # rubocop:disable Metrics/MethodLength
+    Socket.tcp(host, port, connect_timeout: 3) do |sock|
+      sock.sync = true
+      sock.print "GET / HTTP/1.1\r\nHost: #{host}\r\nConnection: close\r\n\r\n"
+      status = sock.readline(chomp: true)
+      raise(ResolvError, "#{host}:#{port} response: #{status}") unless status.start_with? "HTTP/1.1 200 "
+
+      content_length = 0
+      until (header = sock.readline(chomp: true)).empty?
+        if (m = header.match(/^Content-Length: (\d+)/))
+          content_length = m[1].to_i
+        end
+      end
+      ip = sock.read(content_length).chomp
+      Resolv::IPv4.create ip
     end
   end
 
@@ -172,9 +184,7 @@ module Sparoid # rubocop:disable Metrics/ModuleLength
   class Instance
     include Sparoid
 
-    private
-
-    def public_ip
+    def public_ip(*args)
       @public_ip ||= super
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sparoid
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.2.0
 platform: ruby
 authors:
 - Carl Hörberg
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-01 00:00:00.000000000 Z
+date: 2024-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -36,6 +36,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGELOG.md
+- CODEOWNERS
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -70,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Single Packet Authorisation client