terminalwire 0.1.13 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b3e02592c8154c835d32f4dc149d47212665f5dd2974d2634746207ced582b3
-  data.tar.gz: 0a4b15090653b5b54a10a215db6a39ee5465cac9a10c4e1cd29ba7fc0622822a
+  metadata.gz: 7368802178d36d058c4502624e50e831358e6b4bc47bbb40a18a8837063443a7
+  data.tar.gz: eaeedd98707062d3a639250cb53e3dd619bcd3d63b1e2a6ee51d916edb5da9df
 SHA512:
-  metadata.gz: d74b1186e46a73eb62de35f0624f20a4f3f90aa8bf24137b772423a87a09bea920886824d7175c5b08bd18c963b3823c4cccbff0e7abd44120bfe186edda84e6
-  data.tar.gz: 9997f63145801d3ca47476ead70f49ac001f77765cb777063b44b62d96e1b3dfdf266f42897fae01eb0a9a224e8fddeb5e878533e773f11aaafe2e81512a48f4
+  metadata.gz: e0fb8c62c74528e3de4701ebced6e3e794d973ca67eddfdc140a645e9ecc676ae994095a3d08b4da731f3c87bf258018818d55562325016b4f4eee6dd9f17a6f
+  data.tar.gz: d27e62fdcf8582293fb89395acd0e9e9282c616fbb8eb9b8592f95b1a931465011ab9d006b11afa23d1719e1c97e0a61b9ffcb74619aec03f3f1a2286b57e2b6

data/lib/terminalwire/authority.rb

@@ -0,0 +1,49 @@
+require "uri"
+require "base64"
+
+# Resolves domains into authorities, which are is used for access
+# identity control in Terminalwire.
+class Terminalwire::Authority
+  # Used to seperate path keys in the URL.
+  PATH_SEPERATOR = "/".freeze
+
+  # Used to demark a URL string as authorative.
+  SCHEME = "terminalwire://".freeze
+
+  def initialize(url:)
+    @url = URI(url)
+  end
+
+  # Extracted from HTTP. This is so we can
+  def domain
+    if @url.port == @url.default_port
+      @url.host
+    else
+      "#{@url.host}:#{@url.port}"
+    end
+  end
+
+  # Useful for identifying the authority in UI without the protocol.
+  def name
+    [domain, path].join
+  end
+
+  # Make sure there's always a / at the end of the path.
+  def path
+    path_keys.join(PATH_SEPERATOR).prepend(PATH_SEPERATOR)
+  end
+
+  def to_s
+    [SCHEME, domain, path].join
+  end
+
+  def key
+    Base64.urlsafe_encode64(to_s)
+  end
+
+  protected
+
+  def path_keys
+    @url.path.scan(/[^\/]+/)
+  end
+end

data/lib/terminalwire/client/entitlement.rb

@@ -145,7 +145,8 @@ module Terminalwire::Client
       end
 
       def authority_path
-        root_path.join("authorities/#{authority}")
+        # TODO: Change this so it's per endpoint and not domain
+        root_path.join("authorities/#{authority.domain}")
       end
 
       def storage_path
@@ -158,7 +159,7 @@ module Terminalwire::Client
 
       def serialize
         {
-          authority: @authority,
+          authority: @authority.to_s,
           schemes: @schemes.serialize,
           paths: @paths.serialize,
           storage_path: storage_path.to_s,
@@ -203,23 +204,13 @@ module Terminalwire::Client
     end
 
     def self.from_url(url)
-      url = URI(url)
+      authority = Terminalwire::Authority.new(url:)
 
-      case url.host
+      case authority.domain
       when RootPolicy::HOST
-        RootPolicy.new
+        RootPolicy.new authority:
       else
-        Policy.new authority: url_authority(url)
-      end
-    end
-
-    def self.url_authority(url)
-      # I had to lift this from URI::HTTP because `ws://` doesn't
-      # have an authority method.
-      if url.port == url.default_port
-        url.host
-      else
-        "#{url.host}:#{url.port}"
+        Policy.new authority:
       end
     end
   end

data/lib/terminalwire/client.rb

@@ -53,15 +53,6 @@ module Terminalwire
       end
     end
 
-    # Extracted from HTTP. This is so we can
-    def self.authority(url)
-      if url.port == url.default_port
-        url.host
-      else
-        "#{url.host}:#{url.port}"
-      end
-    end
-
     def self.websocket(url:, arguments: ARGV, entitlement: nil)
       url = URI(url)
 

data/lib/terminalwire/licensing.rb

@@ -14,6 +14,10 @@ module Terminalwire::Licensing
     generate_private_key.to_pem
   end
 
+  def self.time
+    Time.now.utc
+  end
+
   # Handles encoding data into a license key with prefixes that can be packed and unpacked.
   module Key
     # Mix into classes that need to generate or read keys
@@ -84,10 +88,10 @@ module Terminalwire::Licensing
 
       VERSION = "1.0".freeze
 
-      def initialize(public_key:, license_url:)
+      def initialize(public_key:, license_url:, generated_at: Terminalwire::Licensing.time)
         @public_key = public_key
         @license_url = URI(license_url)
-        @generated_at = Time.now.utc
+        @generated_at = generated_at
       end
 
       def to_h
@@ -111,7 +115,7 @@ module Terminalwire::Licensing
 
       # This means the server will tolerate a 10 minute drift in the generated_at time.
       def self.drift
-        now = Time.now.utc
+        now = Terminalwire::Licensing.time
         (now - DRIFT_SECONDS)...(now + DRIFT_SECONDS)
       end
 
@@ -147,10 +151,10 @@ module Terminalwire::Licensing
       include Key::Serialization
       PREFIX = "client_key_".freeze
 
-      def initialize(server_key:)
+      def initialize(server_key:, generated_at: Terminalwire::Licensing.time)
         @data = Issuer::ServerKeyGenerator.deserialize server_key
-        @generated_at = Time.now.utc
         @license_url = URI(@data.fetch("license_url"))
+        @generated_at = generated_at
       end
 
       def to_h

data/lib/terminalwire/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Terminalwire
-  VERSION = "0.1.13"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terminalwire
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.15
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-26 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-websocket
@@ -161,6 +161,7 @@ files:
 - lib/generators/terminalwire/install/templates/main_terminal.rb
 - lib/terminalwire.rb
 - lib/terminalwire/adapter.rb
+- lib/terminalwire/authority.rb
 - lib/terminalwire/client.rb
 - lib/terminalwire/client/entitlement.rb
 - lib/terminalwire/client/exec.rb