avmtrf1-tools 0.32.1 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: defb31ef2f0bf05b7d4b7494fe52de69ebd8c185960b424a9e45a47940dd6dda
-  data.tar.gz: 26106fc3e212633ee736cf5a3eddff3c7b88d7ff4f2ffc4e01e4b8a1ac6fcac6
+  metadata.gz: 28aaea569505102ad3211b02ec77cf0c2b290acc629b3530190acf0603f289d1
+  data.tar.gz: 755924e206af72290f5958622a20a545cf925882b4ebc6a8c1e5fc7821bbe6ef
 SHA512:
-  metadata.gz: e86b04b4630700d28300c943e34d85ec3df34ebbcf1f044412ae451ce82b53e9934f035509dd9a937b9668fd67aa4b7b96b76d4cba3a189deceb78d651d849e5
-  data.tar.gz: baa89a45439b8a116fb77df244a16eaf8e73146a2733f95f073db3e5a30d389ad7bbc8717c2ce8614983c51eecae121672fd6877cba91d3dd2ae8c042f00f694
+  metadata.gz: 767c2478bcc066672821f52114c903f4bf6e30f44b6a1a746c045cce80c33b8589f1fc36051b33009fc02318ff6971b15cc039cc9aad7b725ea93a291a5aa563
+  data.tar.gz: 382e3a8930764a843005e9c24a2f8e9f1cb3deb89886433ed34bcfa40996aaf2a57324c8e61a146cb1834810dff2deeb4fc13fddbb53eb8fbc75610fab557f43

data/lib/avmtrf1/openvpn/config/builder.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/openvpn/config/parser'
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/fs/temp'
+
+module Avmtrf1
+  module Openvpn
+    module Config
+      class Builder
+        common_constructor :source_data do
+          unless source_data.is_a?(::Hash)
+            self.source_data = ::Avmtrf1::Openvpn::Config::Parser.new(source_data.to_s).data
+          end
+        end
+
+        def data
+          [simple, tags].reject(&:blank?).join("\n")
+        end
+
+        def on_data_file
+          ::EacRubyUtils::Fs::Temp.on_file do |file|
+            file.write(data)
+            yield(file)
+          end
+        end
+
+        def simple
+          source_data.fetch(:simple)
+                     .map { |s| ::Shellwords.join([s.fetch(:attribute)] + s.fetch(:args)) }
+                     .map { |s| "#{s}\n" }.join
+        end
+
+        def simple_add_or_update(name, args)
+          new_data = { attribute: name, args: args }
+          s = simple_find(name)
+          if s
+            s.merge!(new_data)
+          else
+            source_data.fetch(:simple) << new_data
+          end
+        end
+
+        def tags
+          source_data.fetch(:tags).map { |t| tag_to_data(t) }
+        end
+
+        def tag_to_data(tag)
+          ["<#{tag.fetch(:name)}>", tag.fetch(:content), "</#{tag.fetch(:name)}>"]
+            .map { |v| "#{v}\n" }.join
+        end
+
+        def simple_find(name)
+          source_data.fetch(:simple).find { |s| s.fetch(:attribute) == name }
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/openvpn/config/parser.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'aranha/parsers/base'
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Openvpn
+    module Config
+      class Parser < ::Aranha::Parsers::Base
+        require_sub __FILE__
+
+        def data
+          builder = ::Avmtrf1::Openvpn::Config::Parser::Builder.new
+          content.each_line { |line| builder.add_line(line) }
+          { simple: builder.simple.map(&:data), tags: builder.tags.map(&:data) }
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/openvpn/config/parser/builder.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/openvpn/config/parser/line'
+require 'avmtrf1/openvpn/config/parser/simple'
+require 'avmtrf1/openvpn/config/parser/tag'
+
+module Avmtrf1
+  module Openvpn
+    module Config
+      class Parser < ::Aranha::Parsers::Base
+        class Builder
+          attr_reader :simple, :tags
+
+          def initialize
+            @simple = []
+            @tags = []
+          end
+
+          def add_line(line_text)
+            line = ::Avmtrf1::Openvpn::Config::Parser::Line.new(line_text)
+            if on_tag?
+              add_line_on_tag(line)
+            else
+              add_line_not_on_tag(line)
+            end
+          end
+
+          def add_line_on_tag(line)
+            if line.close_tag?
+              if line.tag_name != current_tag.name
+                raise("Closing tag \"#{line.tag_name}\" does not match current tag " \
+                    "\"#{current_tag}\"")
+              end
+
+              current_tag.close
+            else
+              current_tag.add_line(line.text)
+            end
+          end
+
+          def add_line_not_on_tag(line)
+            return if line.blank_text?
+
+            if line.open_tag?
+              tags << ::Avmtrf1::Openvpn::Config::Parser::Tag.new(line.tag_name)
+            else
+              simple << ::Avmtrf1::Openvpn::Config::Parser::Simple.new(line.simple_parts)
+            end
+          end
+
+          def current_tag
+            tags.last
+          end
+
+          def on_tag?
+            tags.last.if_present(false, &:open?)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/openvpn/config/parser/line.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Openvpn
+    module Config
+      class Parser < ::Aranha::Parsers::Base
+        class Line
+          OPEN_TAG_PATTERN = /\A<(.+)>\z/.freeze
+          CLOSE_TAG_PATTERN = %r{\A</(.+)>\z}.freeze
+          SIMPLE_PATTERN = /\A(\S+)(?:\s+(\S.*))\z/.freeze
+
+          common_constructor :text do
+            self.text = text.rstrip
+          end
+
+          def simple_parts
+            ::Shellwords.split(text)
+          end
+
+          def blank_text?
+            text.blank?
+          end
+
+          def open_tag?
+            OPEN_TAG_PATTERN.match?(text)
+          end
+
+          def close_tag?
+            CLOSE_TAG_PATTERN.match?(text)
+          end
+
+          def tag_name
+            if close_tag?
+              CLOSE_TAG_PATTERN.if_match(text) { |m| m[1] }
+            elsif open_tag?
+              OPEN_TAG_PATTERN.if_match(text) { |m| m[1] }
+            else
+              raise "Unmapped branch in #{__method__}"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/openvpn/config/parser/simple.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Openvpn
+    module Config
+      class Parser < ::Aranha::Parsers::Base
+        class Simple
+          common_constructor :parts
+
+          def data
+            { attribute: attribute, args: args }
+          end
+
+          def attribute
+            parts.first
+          end
+
+          def args
+            parts[1..-1]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/openvpn/config/parser/tag.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module Avmtrf1
+  module Openvpn
+    module Config
+      class Parser < ::Aranha::Parsers::Base
+        class Tag
+          common_constructor :name do
+            @open = true
+          end
+
+          def add_line(text)
+            lines << text
+          end
+
+          def data
+            { name: name, content: lines.join("\n") }
+          end
+
+          def open?
+            @open
+          end
+
+          def close
+            @open = false
+          end
+
+          private
+
+          def lines
+            @lines ||= []
+          end
+        end
+      end
+    end
+  end
+end

data/lib/avmtrf1/tools/runner/openvpn.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
+require 'avmtrf1/ad_user'
 require 'avmtrf1/executables'
+require 'avmtrf1/openvpn/config/builder'
 require 'eac_cli/core_ext'
 
 module Avmtrf1
@@ -10,17 +12,25 @@ module Avmtrf1
         runner_with :help do
           desc 'Conecta-se utilizando OpenVPN com configurações dinâmicas.'
           bool_opt '-S', '--no-sudo', 'Não executa com "sudo".'
+          bool_opt '-A', '--no-ad-auth', 'Não utiliza autenticação do Active Directory.'
           pos_arg :ovpn_path
         end
 
         def run
-          infov 'Arquivo de configuração', parsed.ovpn_path
-          infov 'Linha de comando', ::Shellwords.join(command.args)
-          infov 'Resultado', command.system
+          on_temp_files do
+            start_banner
+            infov 'Resultado', command.system
+          end
         end
 
         private
 
+        attr_accessor :credentials_path, :ovpn_config_path
+
+        def ad_auth?
+          !parsed.no_ad_auth?
+        end
+
         def command_uncached
           if parsed.no_sudo?
             ::Avmtrf1::Executables.env.command(*openvpn_args)
@@ -29,8 +39,51 @@ module Avmtrf1
           end
         end
 
+        def config_builder_uncached
+          r = ::Avmtrf1::Openvpn::Config::Builder.new(parsed.ovpn_path)
+          r.simple_add_or_update('auth-user-pass', [credentials_path.to_path]) if ad_auth?
+          r
+        end
+
         def openvpn_args
-          ['openvpn', '--config', parsed.ovpn_path]
+          ['openvpn', '--config', ovpn_config_path]
+        end
+
+        def start_banner
+          infov 'Arquivo de configuração', parsed.ovpn_path
+          infov 'Linha de comando', ::Shellwords.join(command.args)
+        end
+
+        def on_temp_files
+          on_credentials_file do
+            on_config_file { yield }
+          end
+        end
+
+        def on_credentials_file(&block)
+          if ad_auth?
+            on_temp_file(:credentials_path, -> { credentials_content }, &block)
+          else
+            block.call
+          end
+        end
+
+        def on_config_file(&block)
+          on_temp_file(:ovpn_config_path, -> { config_builder.data }, &block)
+        end
+
+        def on_temp_file(attr, content_proc)
+          ::EacRubyUtils::Fs::Temp.on_file do |file|
+            file.write(content_proc.call)
+            send("#{attr}=", file)
+            yield
+            send("#{attr}=", nil)
+          end
+        end
+
+        def credentials_content
+          [::Avmtrf1.ad_user.username, ::Avmtrf1.ad_user.password]
+            .map { |v| "#{v}\n" }.join
         end
       end
     end

data/lib/avmtrf1/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Avmtrf1
   module Tools
-    VERSION = '0.32.1'
+    VERSION = '0.33.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avmtrf1-tools
 version: !ruby/object:Gem::Version
-  version: 0.32.1
+  version: 0.33.0
 platform: ruby
 authors:
 - Eduardo H. Bogoni
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -305,6 +305,12 @@ files:
 - lib/avmtrf1/jira/entities.rb
 - lib/avmtrf1/jira/entities/issue.rb
 - lib/avmtrf1/jira/instance.rb
+- lib/avmtrf1/openvpn/config/builder.rb
+- lib/avmtrf1/openvpn/config/parser.rb
+- lib/avmtrf1/openvpn/config/parser/builder.rb
+- lib/avmtrf1/openvpn/config/parser/line.rb
+- lib/avmtrf1/openvpn/config/parser/simple.rb
+- lib/avmtrf1/openvpn/config/parser/tag.rb
 - lib/avmtrf1/oracle.rb
 - lib/avmtrf1/oracle/connection.rb
 - lib/avmtrf1/oracle/connection/base.rb