murakumo 0.3.9 → 0.4.0

data/bin/murakumo-show-ec2-tags

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'optparse'
+require 'util/murakumo_ec2_tags'
+
+access_key = nil
+secret_key = nil
+endpoint = nil
+instance_id = nil
+
+ARGV.options do |opt|
+  opt.on('-k', '--access-key ACCESS_KEY') {|v| access_key = v }
+  opt.on('-s', '--secret-key SECRET_KEY') {|v| secret_key = v }
+  opt.on('-r', '--region REGION') {|v| endpoint = v }
+  opt.on('-i', '--instance-id INSTANCE_ID') {|v| instance_id = v }
+  opt.parse!
+
+  access_key ||= ENV['AMAZON_ACCESS_KEY_ID']
+  secret_key ||= ENV['AMAZON_SECRET_ACCESS_KEY']
+
+  unless access_key and secret_key
+    puts opt.help
+    exit 1
+  end
+end
+
+tags = Murakumo::Util::ec2_tags(access_key, secret_key, endpoint, instance_id)
+
+tags.each do |k, v|
+  puts "#{k}\t#{v}"
+end

data/bin/murakumo-show-ip-address

@@ -1,2 +1,5 @@
 #!/usr/bin/env ruby
-puts `/sbin/ifconfig eth0 | awk -F'[: ]+' '/^eth0/,/^$/{if(/inet addr/) print $4}'`.strip
+$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'util/murakumo_self_ip_address'
+
+puts Murakumo::Util.self_ip_address

data/lib/cli/murakumo_initializer_context.rb

@@ -1,4 +1,6 @@
 require 'misc/murakumo_const'
+require 'util/murakumo_self_ip_address'
+require 'util/murakumo_ec2_tags'
 
 module Murakumo
 

data/lib/cli/murakumo_options.rb

@@ -184,6 +184,8 @@ def murakumo_parse_args
             r[3].to_i, # weight
           ]
         end
+      else
+        options[:aliases] = []
       end # aliases
 
       # logger

data/lib/misc/murakumo_const.rb

@@ -1,5 +1,5 @@
 module Murakumo
-  VERSION = '0.3.9'
+  VERSION = '0.4.0'
 
   # Priority
   MASTER = 1

data/lib/util/murakumo_ec2_client.rb

@@ -0,0 +1,69 @@
+require 'cgi'
+require 'base64'
+require 'net/https'
+require 'openssl'
+
+Net::HTTP.version_1_2
+
+module Murakumo
+
+  module Util
+
+    class EC2Client
+
+      API_VERSION = '2011-12-01'
+      SIGNATURE_VERSION = 2
+
+      def initialize(accessKeyId, secretAccessKey, endpoint = 'ec2.us-east-1.amazonaws.com', algorithm = :SHA256)
+        @accessKeyId = accessKeyId
+        @secretAccessKey = secretAccessKey
+        @endpoint = endpoint
+        @algorithm = algorithm
+
+        if /\A[^.]+\Z/ =~ @endpoint
+          @endpoint = "ec2.#{@endpoint}.amazonaws.com"
+        end
+      end
+
+      def query(action, params = {})
+        params = {
+          :Action           => action,
+          :Version          => API_VERSION,
+          :Timestamp        => Time.now.getutc.strftime('%Y-%m-%dT%H:%M:%SZ'),
+          :SignatureVersion => SIGNATURE_VERSION,
+          :SignatureMethod  => "Hmac#{@algorithm}",
+          :AWSAccessKeyId   => @accessKeyId,
+        }.merge(params)
+
+        signature = aws_sign(params)
+        params[:Signature] = signature
+
+        https = Net::HTTP.new(@endpoint, 443)
+        https.use_ssl = true
+        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+        https.start do |w|
+          req = Net::HTTP::Post.new('/',
+            'Host' => @endpoint,
+            'Content-Type' => 'application/x-www-form-urlencoded'
+          )
+
+          req.set_form_data(params)
+          res = w.request(req)
+
+          res.body
+        end
+      end
+
+      private
+      def aws_sign(params)
+        params = params.sort_by {|a, b| a.to_s }.map {|k, v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join('&')
+        string_to_sign = "POST\n#{@endpoint}\n/\n#{params}"
+        digest = OpenSSL::HMAC.digest(OpenSSL::Digest.const_get(@algorithm).new, @secretAccessKey, string_to_sign)
+        Base64.encode64(digest).gsub("\n", '')
+      end
+    end
+
+  end # Util
+
+end # Murakumo

data/lib/util/murakumo_ec2_tags.rb

@@ -0,0 +1,43 @@
+require 'net/http'
+require 'rexml/document'
+
+require 'util/murakumo_ec2_client'
+
+module Murakumo
+
+  module Util
+
+    def ec2_tags(access_key, secret_key, endpoint = nil, instance_id = nil)
+      unless endpoint
+        local_hostname = Net::HTTP.get('169.254.169.254', '/latest/meta-data/local-hostname')
+
+        if /\A[^.]+\.([^.]+)\.compute\.internal\Z/ =~ local_hostname
+          endpoint = $1
+        else
+          endpoint = 'us-east-1'
+        end
+      end
+
+      unless instance_id
+        instance_id = Net::HTTP.get('169.254.169.254', '/latest/meta-data/instance-id')
+      end
+
+      ec2cli = Murakumo::Util::EC2Client.new(access_key, secret_key, endpoint)
+      source = ec2cli.query('DescribeTags', 'Filter.1.Name' => 'resource-id', 'Filter.1.Value' => instance_id)
+
+      tags = {}
+
+      REXML::Document.new(source).each_element('//tagSet/item') do |element|
+        key = element.text('key')
+        value = element.text('value')
+        tags[key] = value
+      end
+
+      return tags
+    end
+
+    module_function :ec2_tags
+
+  end # Util
+
+end # Murakumo

data/lib/util/murakumo_self_ip_address.rb

@@ -0,0 +1,13 @@
+module Murakumo
+
+  module Util
+
+    def self_ip_address
+      `/sbin/ifconfig eth0 | awk -F'[: ]+' '/^eth0/,/^$/{if(/inet addr/) print $4}'`.strip
+    end
+
+    module_function :self_ip_address
+
+  end # Util
+
+end # Murakumo

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murakumo
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 9
-  version: 0.3.9
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - winebarrel
@@ -88,33 +88,38 @@ executables:
 - mrkmctl
 - murakumo-install-init-script
 - murakumo-show-ip-address
+- murakumo-show-ec2-tags
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
 - README
-- bin/murakumo-install-init-script
+- bin/murakumo
+- bin/murakumo-show-ec2-tags
 - bin/murakumo-show-ip-address
+- bin/murakumo-install-init-script
 - bin/mrkmctl
-- bin/murakumo
-- lib/cli/murakumo_options.rb
 - lib/cli/mrkmctl.rb
-- lib/cli/mrkmctl_options.rb
 - lib/cli/murakumo.rb
+- lib/cli/murakumo_options.rb
 - lib/cli/murakumo_initializer_context.rb
-- lib/srv/murakumo_health_check_notifier.rb
-- lib/srv/murakumo_balancer.rb
+- lib/cli/mrkmctl_options.rb
+- lib/misc/murakumo_const.rb
+- lib/util/murakumo_ec2_tags.rb
+- lib/util/murakumo_self_ip_address.rb
+- lib/util/murakumo_ec2_client.rb
+- lib/srv/murakumo_health_check_context.rb
 - lib/srv/murakumo_server.rb
+- lib/srv/murakumo_health_check_notifier.rb
 - lib/srv/murakumo_health_checker.rb
+- lib/srv/murakumo_balancer.rb
 - lib/srv/murakumo_cloud.rb
-- lib/srv/murakumo_health_check_context.rb
-- lib/misc/murakumo_const.rb
-- etc/murakumo-update-config-for-ec2
-- etc/gai.conf.example
+- etc/murakumo.server
 - etc/murakumo.yml.example
+- etc/gai.conf.example
+- etc/murakumo-update-config-for-ec2
 - etc/dhclient-script.patch
-- etc/murakumo.server
 homepage: https://bitbucket.org/winebarrel/murakumo
 licenses: []
 
@@ -144,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.1
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: Murakumo is the internal DNS server which manages name information using a gossip protocol.