cryptoform 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0f9f5718fd04bc8d3b41709ab275e3c3149c687a05620d08befcfe6ab142465
-  data.tar.gz: e1007775f8a6ac33000f526f99f9704339e715c133b663a0c29ba00d625acfa3
+  metadata.gz: 2c6cc60c333e671e55fbfd296176c2ced70ac3b4fcb02123e1978935ee6de35e
+  data.tar.gz: 21c722a203ce621da18fea553a8c1723aa9c4b3357a562aa17a3c1b3d71442dc
 SHA512:
-  metadata.gz: 24159b9944f41adae6d9a040531d6470dd5bac1a3de7d08e7d736ece145c7e4f827f3cb205bcc99179005b4cbf04ff21ab6556ee89ad043b5b99946ab5924853
-  data.tar.gz: 5bb71e41df20928ec480e2eb0c497646e7b43b7087a083900e0f2ddef3926237cc6f95aea6d4f9d04bd0b436309e7b6fe712423c8f1cb67817edbd10c513f8d1
+  metadata.gz: ad46477f8340822cb0ece4cedb09f901e9bc12d35c463bb24cc55905d771b65c4fd19fc6c3cec8c8fd555581cd7b61de8b2d208f6615241d00280118960f47fb
+  data.tar.gz: 78ae779546f83c481e1c8566c33576c6996a93be972b5d33831616bc3141e7fef6bf16b11fcfe102020ec5140918d74ec9b71c22944d2777327c4eb69894f6bd

data/Cryptofile

@@ -2,12 +2,7 @@
 
 port 3000
 
-state :state1 do
-  storage_backend :file, name: "state1.tfstate.enc"
-  encryption_backend :lockbox, key: -> { ENV.fetch("CRYPTOFORM_KEY") }
-end
-
-state :state2 do
-  storage_backend :file, name: "state2.tfstate.enc"
+state :state do
+  storage_backend :file
   encryption_backend :lockbox, key: -> { ENV.fetch("CRYPTOFORM_KEY") }
 end

data/Gemfile.lock

@@ -1,50 +1,27 @@
 PATH
   remote: .
   specs:
-    cryptoform (0.2.0)
-      async-http (~> 0.69)
+    cryptoform (0.4.0)
       base64 (~> 0.2)
       lockbox (~> 1.3)
+      rackup (~> 2.1)
+      sinatra (~> 4.0)
+      sinatra-contrib (~> 4.0)
+      webrick (~> 1.8)
       zeitwerk (~> 2.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    async (2.12.1)
-      console (~> 1.25, >= 1.25.2)
-      fiber-annotation
-      io-event (~> 1.6, >= 1.6.5)
-    async-http (0.69.0)
-      async (>= 2.10.2)
-      async-pool (~> 0.7)
-      io-endpoint (~> 0.11)
-      io-stream (~> 0.4)
-      protocol-http (~> 0.26)
-      protocol-http1 (~> 0.19)
-      protocol-http2 (~> 0.18)
-      traces (>= 0.10)
-    async-pool (0.7.0)
-      async (>= 1.25)
     backport (1.2.0)
     base64 (0.2.0)
     benchmark (0.3.0)
     childprocess (5.0.0)
-    console (1.25.2)
-      fiber-annotation
-      fiber-local (~> 1.1)
-      json
     diff-lcs (1.5.1)
     docile (1.4.0)
     e2mmap (0.1.0)
-    fiber-annotation (0.2.0)
-    fiber-local (1.1.0)
-      fiber-storage
-    fiber-storage (0.1.2)
     iniparse (1.5.0)
-    io-endpoint (0.11.0)
-    io-event (1.6.5)
-    io-stream (0.4.0)
     jaro_winkler (1.6.0)
     json (2.7.2)
     kramdown (2.4.0)
@@ -54,6 +31,9 @@ GEM
     language_server-protocol (3.17.0.3)
     lockbox (1.3.3)
     mini_portile2 (2.8.7)
+    multi_json (1.15.0)
+    mustermann (3.0.0)
+      ruby2_keywords (~> 0.0.1)
     nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -67,14 +47,16 @@ GEM
     parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
-    protocol-hpack (1.4.3)
-    protocol-http (0.26.8)
-    protocol-http1 (0.19.1)
-      protocol-http (~> 0.22)
-    protocol-http2 (0.18.0)
-      protocol-hpack (~> 1.4)
-      protocol-http (~> 0.18)
     racc (1.8.0)
+    rack (3.1.7)
+    rack-protection (4.0.0)
+      base64 (>= 0.1.0)
+      rack (>= 3.0.0, < 4)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
     rainbow (3.1.1)
     rake (13.2.1)
     rbs (2.8.4)
@@ -119,12 +101,25 @@ GEM
     rubocop-rspec (3.0.3)
       rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
+    sinatra (4.0.0)
+      mustermann (~> 3.0)
+      rack (>= 3.0.0, < 4)
+      rack-protection (= 4.0.0)
+      rack-session (>= 2.0.0, < 3)
+      tilt (~> 2.0)
+    sinatra-contrib (4.0.0)
+      multi_json (>= 0.0.2)
+      mustermann (~> 3.0)
+      rack-protection (= 4.0.0)
+      sinatra (= 4.0.0)
+      tilt (~> 2.0)
     solargraph (0.50.0)
       backport (~> 1.2)
       benchmark
@@ -144,8 +139,8 @@ GEM
     strscan (3.1.0)
     thor (1.3.1)
     tilt (2.4.0)
-    traces (0.11.1)
     unicode-display_width (2.5.0)
+    webrick (1.8.1)
     yard (0.9.36)
     zeitwerk (2.6.16)
 

data/README.md

@@ -33,7 +33,7 @@ bother configuring an external state store.
     ```hcl
     terraform {
         backend "http" {
-            address = "http://127.0.0.1:3000/state"
+            address = "http://127.0.0.1:3000/states/state"
         }
     }
     ```
@@ -52,7 +52,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/cryptoform. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/cryptoform/blob/main/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/zhulik/cryptoform. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/zhulik/cryptoform/blob/main/CODE_OF_CONDUCT.md).
 
 ## License
 
@@ -60,4 +60,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Cryptoform project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/cryptoform/blob/main/CODE_OF_CONDUCT.md).
+Everyone interacting in the Cryptoform project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/zhulik/cryptoform/blob/main/CODE_OF_CONDUCT.md).

data/exe/cryptoform

@@ -3,10 +3,4 @@
 
 require "cryptoform"
 
-begin
-  Sync do
-    Cryptoform.run("Cryptofile")
-  end
-rescue Interrupt
-  puts("Interrupted")
-end
+Cryptoform.run("Cryptofile")

data/lib/cryptoform/application.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+class Cryptoform::Application < Sinatra::Application
+  set :show_exceptions, false
+
+  def initialize(config)
+    super
+    @states = config.states
+  end
+
+  get "/states/:name" do
+    state = state_config.encryption_backend.decrypt(state_config.storage_backend.read)
+    json(state)
+  end
+
+  post "/states/:name" do
+    state = JSON.parse(request.body.read)
+    state_config.storage_backend.write(state_config.encryption_backend.encrypt(state))
+    json(state)
+  end
+
+  error Cryptoform::StateMissingError do |e|
+    status 404
+    json(error: e.message)
+  end
+
+  error Sinatra::NotFound do |e|
+    status 404
+    json(error: e.message)
+  end
+
+  private
+
+  def state_config
+    name = params[:name].to_sym
+    @states[name] || raise(Sinatra::NotFound, "state #{name} is not configured in Cryptofile")
+  end
+end

data/lib/cryptoform/server.rb

@@ -2,55 +2,20 @@
 
 class Cryptoform::Server
   def initialize(config)
-    @config = config
-  end
-
-  def run
-    logger.info { "Cryptoform is listening on #{endpoint.url}..." }
-    Async::HTTP::Server.for(endpoint) do |request|
-      log_request(request) { handle_request(request) }
-    end.run
-  end
-
-  private
-
-  def handle_request(request) # rubocop:disable Metrics/AbcSize
-    name = request.path.split("/")&.[](1)&.to_sym
-    return ::Protocol::HTTP::Response[404, {}, []] unless @config.states.key?(name)
-
-    handler_name = :"#{request.method.downcase}_state"
-    return ::Protocol::HTTP::Response[405, {}, []] unless respond_to?(handler_name, true)
-
-    send(handler_name, @config.states[name], request:)
-  rescue Cryptoform::StateMissingError
-    ::Protocol::HTTP::Response[404, {}, []]
-  rescue StandardError => e
-    logger.error(e)
-    ::Protocol::HTTP::Response[500, {}, []]
-  end
+    @server = WEBrick::HTTPServer.new(
+      Port: config.port,
+      BindAddress: "0.0.0.0",
+      AccessLog: [
+        [$stdout, WEBrick::AccessLog::COMMON_LOG_FORMAT],
+        [$stdout, WEBrick::AccessLog::REFERER_LOG_FORMAT]
+      ]
+    )
+    trap("INT") { @server.shutdown }
 
-  def get_state(state_config, *)
-    state = state_config.encryption_backend.decrypt(state_config.storage_backend.read)
-    ::Protocol::HTTP::Response[200, {}, [JSON.pretty_generate(state)]]
+    @server.mount("/", Rackup::Handler::WEBrick, Cryptoform::Application.new(config))
   end
 
-  def post_state(state_config, request:)
-    state_config.storage_backend.write(state_config.encryption_backend.encrypt(request.body.read))
-
-    ::Protocol::HTTP::Response[201, {}, []]
-  end
-
-  def logger
-    @logger ||= Logger.new($stdout)
-  end
-
-  def endpoint
-    @endpoint ||= Async::HTTP::Endpoint.parse("http://localhost:#{@config.port}")
-  end
-
-  def log_request(request)
-    yield.tap do |response|
-      logger.info { "#{request.method} #{request.path}: #{response.status}" }
-    end
+  def run
+    @server.start
   end
 end

data/lib/cryptoform/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Cryptoform
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

data/lib/cryptoform.rb

@@ -4,7 +4,10 @@ require "zeitwerk"
 require "logger"
 
 require "lockbox"
-require "async/http"
+require "webrick"
+require "rackup"
+require "sinatra"
+require "sinatra/json"
 
 loader = Zeitwerk::Loader.for_gem
 

data/terraform/backend.tf

@@ -1,5 +1,5 @@
 terraform {
   backend "http" {
-    address = "http://127.0.0.1:3000/state1"
+    address = "http://127.0.0.1:3000/states/state"
   }
 }

metadata

@@ -1,57 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: cryptoform
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-07-13 00:00:00.000000000 Z
+date: 2024-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: async-http
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.69'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.69'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: base64
+  name: lockbox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: lockbox
+  name: rackup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +129,7 @@ files:
 - Rakefile
 - exe/cryptoform
 - lib/cryptoform.rb
+- lib/cryptoform/application.rb
 - lib/cryptoform/config/builder.rb
 - lib/cryptoform/config/state_config_builder.rb
 - lib/cryptoform/encryption_backends/backend.rb