cryptopro 0.0.3 → 0.1.1

data/README.textile

@@ -19,5 +19,9 @@ h1. Использование
 
     Cryptopro::Csr.issue_test_certificate(csr)
 
+Получение информации по сертификату:
+
+    Cryptopro::Certificate.info(body)
+
 Copyright (c) 2011 divineforest, evrone.com
 This project rocks and uses MIT-LICENSE.

data/lib/cryptopro.rb

@@ -1,5 +1,7 @@
+require 'cryptopro/base'
 require 'cryptopro/csr'
 require 'cryptopro/signature'
+require 'cryptopro/certificate'
 
 module Cryptopro
 end

data/lib/cryptopro/base.rb

@@ -0,0 +1,39 @@
+require 'tmpdir'
+require 'digest/md5'
+require 'cocaine'
+
+module Cryptopro
+  class Base
+    CERTIFICATE_FILE_NAME = "certificate.cer"
+    CERTIFICATE_LINE_LENGTH = 64
+
+    def self.create_temp_dir
+      uniq_name = Digest::MD5.hexdigest("#{rand(1_000_000)}#{Time.now}")
+      full_name = "#{Dir.tmpdir}/cryptcp/#{uniq_name}"
+      FileUtils.mkdir_p(full_name)
+    end
+
+    def self.create_temp_file(dir_name, file_name, content)
+      full_path = "#{dir_name}/#{file_name}"
+      File.open(full_path, "w") { |file| file.write(content) }
+      full_path
+    end
+
+    # Добавляет -----BEGIN CERTIFICATE----- / -----END CERTIFICATE-----, если их нет.
+    # Так же делит длинную строку Base64 на строки по 64 символа.
+    # Это требование cryptcp к файл с сертификатом.
+    def self.add_container_to_certificate(certificate)
+      return certificate if certificate.downcase.include?("begin")
+
+      parts = certificate.scan(/.{1,#{CERTIFICATE_LINE_LENGTH}}/)
+      certificate_with_container = "-----BEGIN CERTIFICATE-----\n#{parts.join("\n")}\n-----END CERTIFICATE-----"
+    end
+
+    def self.create_temp_certificate_file(content)
+      tmp_dir = create_temp_dir
+      certificate_with_container = add_container_to_certificate(content)
+      create_temp_file(tmp_dir, CERTIFICATE_FILE_NAME, certificate_with_container)
+    end
+
+  end
+end

data/lib/cryptopro/certificate.rb

@@ -0,0 +1,61 @@
+module Cryptopro
+  class Certificate < Cryptopro::Base
+
+    def self.info(certificate_body)
+      certificate_file_path = create_temp_certificate_file(certificate_body)
+      cryptopro_answer = get_info(certificate_file_path)
+      convert_from_raw_to_hashes(cryptopro_answer)
+    end
+
+    private
+
+      def self.get_info(certificate_file_path)
+        Cocaine::CommandLine.path = ["/opt/cprocsp/bin/amd64", "/opt/cprocsp/bin/ia32"]
+        line = Cocaine::CommandLine.new("certmgr", "-list -f :certificate",
+          :certificate => certificate_file_path
+        )
+        begin
+          line.run
+        rescue Cocaine::ExitStatusError
+          false
+        rescue Cocaine::CommandNotFoundError => e
+          raise "Command certmgr was not found"
+        end
+      end
+
+      def self.raw_certificates(cryptopro_answer)
+        cleaned_answer = clean_answer(cryptopro_answer)
+        cleaned_answer.split("=============================================================================")
+      end
+
+      def self.clean_answer(cryptopro_answer)
+        cleaned = []
+        cleaned = cryptopro_answer.split("\n")[4..-4]
+        cleaned.join("\n")
+      end
+
+      def self.certificate_extract_info(raw_certificate)
+        info = {}
+        raw_certificate.split("\n").each do |certificate_line|
+          if certificate_line.include?(":")
+            name, value = certificate_line.split(":").map(&:strip)
+            name.gsub!(/\s/, "_")
+            name.downcase!
+            info[name.to_sym] = value
+          end
+        end
+        info
+      end
+
+      def self.convert_from_raw_to_hashes(cryptopro_answer)
+        container_certificates = []
+
+        raw_certificates(cryptopro_answer).each do |raw_certificate|
+          container_certificates << certificate_extract_info(raw_certificate)
+        end
+
+        container_certificates        
+      end
+
+  end
+end

data/lib/cryptopro/signature.rb

@@ -1,15 +1,8 @@
-require 'tmpdir'
-require 'digest/md5'
-require 'cocaine'
-
 module Cryptopro
-  class Signature
+  class Signature < Cryptopro::Base
     MESSAGE_FILE_NAME = "message.txt"
     # Должен называться как файл с сообщением, только расширение .sgn
     SIGNATURE_FILE_NAME = "message.txt.sgn"
-    CERTIFICATE_FILE_NAME = "certificate.cer"
-
-    CERTIFICATE_LINE_LENGTH = 64
 
     # Options: message, signature, certificate
     def self.verify(options)
@@ -17,6 +10,8 @@ module Cryptopro
       raise "Signature required" if (options[:signature].nil? || options[:signature].empty?)
       raise "Certificate required" if (options[:certificate].nil? || options[:certificate].empty?)
 
+      # Для работы с cryptcp требуется, чтобы сообщение, полпись и сертификат были в виде файлов
+      # Создаётся временная уникальная папка для каждой проверки
       tmp_dir = create_temp_dir
       create_temp_files(tmp_dir, options)
       valid = execute(tmp_dir)
@@ -24,14 +19,6 @@ module Cryptopro
 
     private
 
-      # Для работы с cryptcp требуется, чтобы сообщение, полпись и сертификат были в виде файлов
-      # Создаётся временная уникальная папка для каждой проверки
-      def self.create_temp_dir
-        uniq_name = Digest::MD5.hexdigest("#{rand(1_000_000)}#{Time.now}")
-        full_name = "#{Dir.tmpdir}/cryptcp/#{uniq_name}"
-        FileUtils.mkdir_p(full_name)
-      end
-
       def self.create_temp_files(tmp_dir, options)
         # Создать файл сообщения
         create_temp_file(tmp_dir, MESSAGE_FILE_NAME, options[:message])
@@ -42,10 +29,6 @@ module Cryptopro
         create_temp_file(tmp_dir, CERTIFICATE_FILE_NAME, certificate_with_container)
       end
 
-      def self.create_temp_file(dir_name, file_name, content)
-        File.open("#{dir_name}/#{file_name}", "w") { |file| file.write(content) }
-      end
-
       # Обсуждение формата использования: http://www.cryptopro.ru/forum2/Default.aspx?g=posts&t=1516
       # Пример вызова утилиты cryptcp:
       # cryptcp -vsignf -dir /home/user/signs -f certificate.cer message.txt
@@ -67,16 +50,5 @@ module Cryptopro
         end
       end
 
-      # Добавляет -----BEGIN CERTIFICATE----- / -----END CERTIFICATE-----, если их нет.
-      # Так же делит длинную строку Base64 на строки по 64 символа.
-      # Это требование cryptcp к файл с сертификатом.
-      def self.add_container_to_certificate(certificate)
-        return certificate if certificate.downcase.include?("begin")
-
-        parts = certificate.scan(/.{1,#{CERTIFICATE_LINE_LENGTH}}/)
-        certificate_with_container = "-----BEGIN CERTIFICATE-----\n#{parts.join("\n")}\n-----END CERTIFICATE-----"
-      end
-
   end
-
 end

data/lib/cryptopro/version.rb

@@ -1,3 +1,3 @@
 module Cryptopro
-  VERSION = "0.0.3"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cryptopro
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 0
-  - 3
-  version: 0.0.3
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - divineforest
@@ -15,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-14 00:00:00 +03:00
+date: 2011-11-17 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cocaine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -49,6 +46,8 @@ files:
 - Rakefile
 - cryptopro.gemspec
 - lib/cryptopro.rb
+- lib/cryptopro/base.rb
+- lib/cryptopro/certificate.rb
 - lib/cryptopro/csr.rb
 - lib/cryptopro/signature.rb
 - lib/cryptopro/version.rb
@@ -62,27 +61,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: cryptopro
-rubygems_version: 1.6.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: CryptoPro ruby-wrapper for linux