wg-admin 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70eb93699c05f931e8904d01f703d4ec3e63d02cebd0853acd13c63a903cf02d
-  data.tar.gz: 43e8d87dc246fd7d523ef2ffe9f72b2403a19f47a83aa13a308cf6ed5fe71964
+  metadata.gz: e4361bef43715dc99416edb18c4cab3f0229ca8d38072903726901a2578d8324
+  data.tar.gz: 042fa0ab74e47e2ec33429935598b120be011633cbd37e6da5334d110d0db629
 SHA512:
-  metadata.gz: 730e5df74d993c754ac57cdf7a8a91559593ede4d8c4455145fbd3e0673f7d81869ae673ce1d07fc9819b40d5a690b7cfc6aea1d322a40304483385a42ca0fd7
-  data.tar.gz: c65568ea9955110c3b5f66940258d1bc7b07ce9bf2c912f997eea600713a9310975b383658d6540a13e6c727a040fbde04c8a46184fd9cbcc35fd50dbd8ee9df
+  metadata.gz: b5a62ccbe1dcce89c49946c4d066cc3f99dcb60a3baa9464375798acfe4efc2907dd27735fdda39e8922b6bb36c25cabd0f958eb11c4e2abb0b6bc226f292c3b
+  data.tar.gz: ad2fc708a5282a30052895aae1fd118ab97c2815021ac65a99c5e7444fce02abc1571d43b5a0549bc668efc933531b282fd102807e78c9f738abc30d4b60f735

data/.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10
+  ignore:
+  - dependency-name: rubocop-rspec
+    versions:
+    - 1.41.0
+  commit-message:
+    prefix: bump
+    include: scope

data/.gitignore

@@ -1,2 +1,3 @@
 mkmf.log
 pkg
+.rake_tasks

data/.rubocop.yml

@@ -1,7 +1,7 @@
 require: rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
 
   DisplayCopNames:
     Enabled: true
@@ -9,9 +9,39 @@ AllCops:
   DisplayStyleGuide:
     Enabled: true
 
+  NewCops: enable
+
 Metrics/BlockLength:
   Exclude:
     - spec/**/*
 
 Layout/LineLength:
   Max: 180
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true
+
+RSpec/NestedGroups:
+  Max: 5
+
+Metrics/CyclomaticComplexity:
+  Exclude:
+    - "lib/wire_guard/admin/**/*"

data/.ruby-version

@@ -1 +1 @@
-2.7.1
+3.0.2

data/.travis.yml

@@ -6,6 +6,6 @@ before_install:
   - sudo apt-get --yes update
   - sudo apt-get --yes install wireguard
 rvm:
-- 2.7.1
-- 2.6.6
-- 2.5.8
+- 2.6.8
+- 2.7.4
+- 3.0.2

data/Gemfile.lock

@@ -1,53 +1,66 @@
 PATH
   remote: .
   specs:
-    wg-admin (0.0.2)
-      thor (~> 1.0.1)
+    wg-admin (0.0.3)
+      thor
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (0.14.14)
-      childprocess (>= 0.6.3, < 4.0.0)
-      contracts (~> 0.9)
-      cucumber (>= 1.3.19)
-      ffi (~> 1.9)
-      rspec-expectations (>= 2.99)
-      thor (>= 0.19, < 2.0)
-    ast (2.4.0)
-    backports (3.17.1)
+    aruba (2.0.0)
+      bundler (>= 1.17, < 3.0)
+      childprocess (>= 2.0, < 5.0)
+      contracts (>= 0.16.0, < 0.18.0)
+      cucumber (>= 4.0, < 8.0)
+      rspec-expectations (~> 3.4)
+      thor (~> 1.0)
+    ast (2.4.2)
     builder (3.2.4)
     byebug (11.1.3)
-    childprocess (3.0.0)
-    coderay (1.1.2)
-    contracts (0.16.0)
-    cucumber (3.1.2)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.2.0)
-      cucumber-expressions (~> 6.0.1)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 5.1.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (3.2.1)
-      backports (>= 3.8.0)
-      cucumber-tag_expressions (~> 1.1.0)
-      gherkin (~> 5.0)
-    cucumber-expressions (6.0.1)
-    cucumber-tag_expressions (1.1.1)
-    cucumber-wire (0.0.1)
-    diff-lcs (1.3)
-    ffi (1.12.2)
-    formatador (0.2.5)
-    gherkin (5.1.0)
-    guard (2.16.2)
+    childprocess (4.1.0)
+    coderay (1.1.3)
+    contracts (0.17)
+    cucumber (7.0.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-core (~> 10.0, >= 10.0.1)
+      cucumber-create-meta (~> 6.0, >= 6.0.1)
+      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
+      cucumber-gherkin (~> 20.0, >= 20.0.1)
+      cucumber-html-formatter (~> 16.0, >= 16.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+      cucumber-wire (~> 6.0, >= 6.0.1)
+      diff-lcs (~> 1.4, >= 1.4.4)
+      mime-types (~> 3.3, >= 3.3.1)
+      multi_test (~> 0.1, >= 0.1.2)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-core (10.0.1)
+      cucumber-gherkin (~> 20.0, >= 20.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+      cucumber-tag-expressions (~> 3.0, >= 3.0.1)
+    cucumber-create-meta (6.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-cucumber-expressions (12.1.1)
+    cucumber-gherkin (20.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+    cucumber-html-formatter (16.0.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+    cucumber-messages (17.0.1)
+    cucumber-tag-expressions (3.0.1)
+    cucumber-wire (6.1.0)
+      cucumber-core (~> 10.0, >= 10.0.1)
+      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
+      cucumber-messages (~> 17.0, >= 17.0.1)
+    diff-lcs (1.4.4)
+    ffi (1.15.3)
+    formatador (0.3.0)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-bundler (3.0.0)
@@ -60,76 +73,89 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     inifile (3.0.0)
-    jaro_winkler (1.5.4)
-    listen (3.2.1)
+    listen (3.6.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.4)
-    method_source (0.9.2)
-    multi_json (1.14.1)
+    lumberjack (1.2.8)
+    method_source (1.0.0)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.0704)
     multi_test (0.1.2)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.19.1)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-byebug (3.7.0)
+    parallel (1.20.1)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry-byebug (3.8.0)
       byebug (~> 11.0)
       pry (~> 0.10)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rb-fsevent (0.10.4)
+    rake (13.0.6)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.1)
-      rspec-support (~> 3.9.1)
-    rspec-expectations (3.9.1)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.2)
-    rubocop (0.79.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.19.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rspec (1.37.1)
-      rubocop (>= 0.68.1)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.10.0)
+      parser (>= 3.0.1.1)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.4.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
     shellany (0.0.1)
-    thor (1.0.1)
-    unicode-display_width (1.6.1)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
+    thor (1.1.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba (~> 0.14.14)
+  aruba
   bundler (~> 2.1)
-  guard (~> 2.16.1)
-  guard-bundler (~> 3.0.0)
-  guard-rspec (~> 4.7.3)
-  inifile (~> 3.0.0)
-  pry (~> 0.12.2)
-  pry-byebug (~> 3.7.0)
-  rake (~> 13.0.1)
-  rspec (~> 3.9.0)
-  rubocop (~> 0.79.0)
-  rubocop-rspec (~> 1.37.1)
+  guard
+  guard-bundler
+  guard-rspec
+  inifile
+  pry
+  pry-byebug
+  rake
+  rspec
+  rubocop
+  rubocop-rake
+  rubocop-rspec
   wg-admin!
 
 BUNDLED WITH
-   2.1.4
+   2.2.22

data/TODO.markdown

@@ -1,3 +1,3 @@
-* if no network is specified, and there is one and only one, use that.
-* pass the private key via command line
-* pass the public key via command line (useful when `wg` is not installed)
+# TODO
+
+*

data/exe/wg-admin

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+
 require 'bundler/setup'
 require 'wire_guard/admin/cli'
 

data/lib/wire_guard/admin/cli.rb

@@ -51,12 +51,19 @@ Available'
       def config(name)
         warn "Using database #{repository.path}" if options[:verbose]
         peer = repository.find_peer(network, name)
-
         case peer
         when Server
-          puts Templates::Server.new(peer, repository.clients(network)).render
+          puts Templates::Server.new(
+            server: peer,
+            network: network,
+            clients: repository.clients(network)
+          ).render
         when Client
-          puts Templates::Client.new(peer, repository.servers(network)).render
+          puts Templates::Client.new(
+            client: peer,
+            network: network,
+            servers: repository.servers(network)
+          ).render
         else
           raise "No template defined for #{peer}"
         end

data/lib/wire_guard/admin/cli/clients.rb

@@ -10,15 +10,18 @@ module WireGuard
     class Clients < Thor
       extend ClassHelpers
       include InstanceHelpers
+      default_command :list
 
-      # rubocop:disable Metrics/AbcSize
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       desc 'add NAME', 'Adds a new client with the given NAME'
       long_desc 'Adds a new client to the configuration database.'
       method_option :network, desc: 'network', aliases: '-n', default: default_network
       method_option :ip, desc: 'the IP address of the new client', aliases: '-i', required: false
+      method_option :private_key, desc: 'The private key of the new client', aliases: '-P', required: false
       def add(name)
         warn "Using database #{repository.path}" if options[:verbose]
         client = Client.new(name: name, ip: ip)
+        client.private_key = options[:private_key] if options[:private_key]
         repository.add_peer(network, client)
         if options[:verbose]
           warn 'New client was successfully added:'
@@ -29,6 +32,17 @@ module WireGuard
         raise Thor::Error, "Error: #{e.message}"
       end
 
+      desc 'remove NAME', 'Removes the client with the given NAME'
+      long_desc 'Removes an existing client from the configuration database.'
+      method_option :network, desc: 'network', aliases: '-n', default: default_network
+      def remove(name)
+        warn "Using database #{repository.path}" if options[:verbose]
+        repository.remove_peer(network, name)
+        warn 'Client was successfully removed.' if options[:verbose]
+      rescue StandardError => e
+        raise Thor::Error, "Error: #{e.message}"
+      end
+
       desc 'list', 'Lists all clients'
       long_desc 'For a given network, lists all clients in the configuration database.'
       method_option :network, desc: 'network', aliases: '-n', default: default_network
@@ -43,7 +57,7 @@ module WireGuard
       rescue StandardError => e
         raise Thor::Error, "Error: #{e.message}"
       end
-      # rubocop:enable Metrics/AbcSize
+      # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
     end
   end
 end

data/lib/wire_guard/admin/cli/helpers.rb

@@ -9,11 +9,11 @@ module WireGuard
     #
     module ClassHelpers
       def default_network
-        if repository.networks.size != 1
-          ENV['WG_ADMIN_NETWORK']
-        else
+        if repository.networks.size == 1
           nw = repository.networks.first
           ENV.fetch('WG_ADMIN_NETWORK', "#{nw}/#{nw.prefix}")
+        else
+          ENV['WG_ADMIN_NETWORK']
         end
       end
 

data/lib/wire_guard/admin/cli/networks.rb

@@ -11,8 +11,8 @@ module WireGuard
     class Networks < Thor
       extend ClassHelpers
       include InstanceHelpers
+      default_command :list
 
-      # rubocop:disable Metrics/AbcSize
       desc 'list', 'Lists all known networks'
       long_desc 'List the networks in the configuration database.'
       def list
@@ -27,8 +27,6 @@ module WireGuard
       rescue StandardError => e
         raise Thor::Error, "Error: #{e.message}"
       end
-      # rubocop:enable Metrics/AbcSize
-
       desc 'add NETWORK', 'Adds a new network'
       long_desc 'Adds a new network to the configuration database.'
       def add(network)

data/lib/wire_guard/admin/cli/peers.rb

@@ -10,6 +10,7 @@ module WireGuard
     class Peers < Thor
       extend ClassHelpers
       include InstanceHelpers
+      default_command :list
 
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       desc 'list', 'Lists all peers'
@@ -21,7 +22,7 @@ module WireGuard
           warn "No clients in network #{network}." if repository.networks.empty?
         end
         repository.peers(network).each do |peer|
-          if STDOUT.tty?
+          if $stdout.tty?
             puts peer
           else
             puts peer.name

data/lib/wire_guard/admin/cli/servers.rb

@@ -10,20 +10,23 @@ module WireGuard
     class Servers < Thor
       extend ClassHelpers
       include InstanceHelpers
+      default_command :list
 
-      # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/AbcSize
+      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       desc 'add NAME', 'Adds a new server'
       long_desc 'Adds a new server with the given public DNS NAME to the configuration database.'
       method_option :network, desc: 'network', aliases: '-n', default: default_network
       method_option :ip, desc: 'the (private) IP address of the new server (within the VPN)', aliases: '-i', required: false
       method_option :port, desc: 'port to listen on', aliases: '-p', required: false
-      method_option :allowed_ips, desc: 'The range of allowed IP addresses that this server is routing', aliases: '-a', required: false
+      method_option :allowed_ips, desc: 'The range of allowed IP addresses that this server is routing. Defaults to the network.', aliases: '-a', required: false
       method_option :device, desc: 'The network device used for forwarding traffic', aliases: '-d', required: false
+      method_option :private_key, desc: 'The private key of the new server', aliases: '-P', required: false
       def add(name)
         warn "Using database #{repository.path}" if options[:verbose]
         server = Server.new(name: name, ip: ip, allowed_ips: options[:allowed_ips] || repository.find_network(network))
         server.device = options[:device] if options[:device]
         server.port = options[:port] if options[:port]
+        server.private_key = options[:private_key] if options[:private_key]
         repository.add_peer(network, server)
         if options[:verbose]
           warn 'New server was successfully added:'
@@ -34,6 +37,17 @@ module WireGuard
         raise Thor::Error, "Error: #{e.message}"
       end
 
+      desc 'remove NAME', 'Removes the server with the given NAME'
+      long_desc 'Removes an existing server from the configuration database.'
+      method_option :network, desc: 'network', aliases: '-n', default: default_network
+      def remove(name)
+        warn "Using database #{repository.path}" if options[:verbose]
+        repository.remove_peer(network, name)
+        warn 'Server was successfully removed.' if options[:verbose]
+      rescue StandardError => e
+        raise Thor::Error, "Error: #{e.message}"
+      end
+
       desc 'list', 'Lists all servers'
       long_desc 'For a given network, lists all servers in the configuration database.'
       method_option :network, desc: 'network', aliases: '-n', default: default_network
@@ -48,7 +62,7 @@ module WireGuard
       rescue StandardError => e
         raise Thor::Error, "Error: #{e.message}"
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/AbcSize
+      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
     end
   end
 end

data/lib/wire_guard/admin/client.rb

@@ -22,22 +22,23 @@ module WireGuard
     # @see https://github.com/pirate/wireguard-docs#peernodedevice
     #
     class Client
-      attr_reader :name, :ip, :private_key, :public_key
+      attr_reader :name, :ip, :public_key, :private_key
 
-      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-      def initialize(name:, ip:, private_key: nil, public_key: nil)
+      def initialize(name:, ip:, private_key: nil)
         raise ArgumentError, 'name must be present' if name.nil?
         raise ArgumentError, 'name must not be empty' if name.empty?
         raise ArgumentError, 'ip must be present' if ip.nil?
         raise ArgumentError, 'private_key must not be empty' if private_key&.empty?
-        raise ArgumentError, 'public_key must not be empty' if public_key&.empty?
 
         @name = name
         @ip = ip
-        @private_key = private_key || generate_private_key
-        @public_key = public_key || generate_public_key
+        self.private_key = private_key || generate_private_key
+      end
+
+      def private_key=(private_key)
+        @private_key = private_key
+        @public_key = generate_public_key
       end
-      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def to_s
         "#{self.class.name.split('::').last} #{name}: #{ip}"
@@ -52,7 +53,11 @@ module WireGuard
       end
 
       def ==(other)
-        name == other.name
+        name == if other.respond_to?(:name)
+                  other.name
+                else
+                  other
+                end
       end
 
       private
@@ -61,7 +66,7 @@ module WireGuard
         Open3.popen3('wg pubkey') do |stdin, stdout, stderr, waiter|
           stdin.write(private_key)
           stdin.close
-          raise InvocationError, stderr.lines unless waiter.value.success?
+          raise InvocationError, stderr.read.lines unless waiter.value.success?
 
           stdout.read.chomp
         end

data/lib/wire_guard/admin/repository.rb

@@ -44,6 +44,15 @@ module WireGuard
         end
       end
 
+      #
+      # Raised if the peer is not known
+      #
+      class UnknownPeer < StandardError
+        def initialize(peer, network)
+          super("Peer #{peer} is unknown in network #{network}.")
+        end
+      end
+
       attr_reader :path
 
       def initialize(path)
@@ -104,6 +113,9 @@ module WireGuard
         end
       end
 
+      #
+      # Delete an existing network
+      #
       def delete_network(network)
         raise ArgumentError, 'network must be an IP address range' unless network.is_a?(IPAddr)
 
@@ -127,6 +139,25 @@ module WireGuard
         end
       end
 
+      #
+      # Remove a peer from the given network
+      #
+      def remove_peer(network, peer_or_name)
+        name = if peer_or_name.respond_to?(:name)
+                 peer_or_name.name
+               else
+                 peer_or_name
+               end
+
+        raise UnknownPeer.new(name, network) unless find_peer(network, name)
+
+        @backend.transaction do
+          raise UnknownNetwork, network unless @backend.root?(network)
+
+          @backend[network].delete(name)
+        end
+      end
+
       #
       # Find the next address within the given network that is not assigned to a peer
       #

data/lib/wire_guard/admin/server.rb

@@ -18,13 +18,12 @@ module WireGuard
       def initialize(
         name:,
         ip:,
+        allowed_ips:,
         private_key: nil,
-        public_key: nil,
         port: 51_820,
-        allowed_ips:,
         device: 'eth0'
       )
-        super(name: name, ip: ip, private_key: private_key, public_key: public_key)
+        super(name: name, ip: ip, private_key: private_key)
 
         raise ArgumentError, 'port must be present' if port.nil?
         raise ArgumentError, 'port number is invalid' unless (1..65_535).cover?(port.to_i)

data/lib/wire_guard/admin/templates/client.rb

@@ -16,9 +16,9 @@ module WireGuard
 
             [Interface]
             PrivateKey = <%= client.private_key %>
-            Address = <%= client.ip %>/24
-
+            Address = <%= client.ip %>/<%= network.prefix %>
             <% servers.each do |server| %>
+
             [Peer]
             PublicKey = <%= server.public_key %>
             EndPoint = <%= server.name %>:<%= server.port %>
@@ -28,13 +28,13 @@ module WireGuard
           CLIENT_TEMPLATE
         end
 
-        attr_reader :client, :servers
+        attr_reader :client, :network, :servers
 
-        def initialize(client, servers)
+        def initialize(client:, network:, servers:)
           @client = client
+          @network = network
           @servers = servers
-          @template = self.class.template
-          super(@template)
+          super(self.class.template, trim_mode: '<>')
         end
 
         def render

data/lib/wire_guard/admin/templates/server.rb

@@ -15,28 +15,28 @@ module WireGuard
             # generated by wg-admin
 
             [Interface]
-            Address = <%= server.ip %>/24
+            Address = <%= server.ip %>/<%= network.prefix %>
             ListenPort = <%= server.port %>
             PrivateKey = <%= server.private_key %>
             # PostUp = iptables -A FORWARD -i %i -j ACCEPT; iptables -A FORWARD -o %i -j ACCEPT; iptables -t nat -A POSTROUTING -o <%= server.device %> -j MASQUERADE
             # PostDown = iptables -D FORWARD -i %i -j ACCEPT; iptables -D FORWARD -o %i -j ACCEPT; iptables -t nat -D POSTROUTING -o <%= server.device %> -j MASQUERADE
-
             <% clients.each do |client| %>
+
             [Peer]
             # Name = <%= client.name %>
             PublicKey = <%= client.public_key %>
-            AllowedIPs = <%= client.ip %>/32
+            AllowedIPs = <%= client.ip %>/<%= client.ip.prefix %>
             <% end %>
           SERVER_TEMPLATE
         end
 
-        attr_reader :server, :clients
+        attr_reader :server, :network, :clients
 
-        def initialize(server, clients)
+        def initialize(server:, network:, clients:)
           @server = server
+          @network = network
           @clients = clients
-          @template = self.class.template
-          super(@template)
+          super(self.class.template, trim_mode: '<>')
         end
 
         def render

data/lib/wire_guard/admin/version.rb

@@ -2,6 +2,6 @@
 
 module WireGuard
   module Admin
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/wg-admin.gemspec

@@ -21,20 +21,22 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '~> 3.0'
 
-  spec.add_runtime_dependency 'thor', '~> 1.0.1'
+  spec.add_runtime_dependency 'thor'
 
-  spec.add_development_dependency 'aruba', '~> 0.14.14'
-  spec.add_development_dependency 'bundler', '~> 2.1'
-  spec.add_development_dependency 'guard', '~> 2.16.1'
-  spec.add_development_dependency 'guard-bundler', '~> 3.0.0'
-  spec.add_development_dependency 'guard-rspec', '~> 4.7.3'
-  spec.add_development_dependency 'inifile', '~> 3.0.0'
-  spec.add_development_dependency 'pry', '~> 0.12.2'
-  spec.add_development_dependency 'pry-byebug', '~> 3.7.0'
-  spec.add_development_dependency 'rake', '~> 13.0.1'
-  spec.add_development_dependency 'rspec', '~> 3.9.0'
-  spec.add_development_dependency 'rubocop', '~> 0.79.0'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.37.1'
+  spec.add_development_dependency 'aruba'
+  spec.add_development_dependency 'bundler', '~>2.1'
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-bundler'
+  spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'inifile'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.add_development_dependency 'rubocop-rspec'
 end
 # rubocop:enable Metrics/BlockLength

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: wg-admin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Steffen Uhlig
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2021-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.14
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.14
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,142 +56,156 @@ dependencies:
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.16.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.37.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.37.1
+        version: '0'
 description: wg-admin is an administration tool for WireGuard configuration.
 email:
 - steffen@familie-uhlig.net
@@ -200,7 +214,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".dependabot/config.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -231,23 +245,23 @@ homepage: https://github.com/uhlig-it/wg-admin
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: WireGuard administration tool
 test_files: []

data/.dependabot/config.yml

@@ -1,16 +0,0 @@
-version: 1
-update_configs:
-  - package_manager: "ruby:bundler"
-    directory: "/"
-    update_schedule: "live"
-    automerged_updates:
-      - match:
-          dependency_type: "development"
-          update_type: "all"
-      - match:
-          dependency_type: "production"
-          update_type: "semver:minor"
-    version_requirement_updates: auto
-    commit_message:
-      prefix: "bump"
-      include_scope: true