pechkin 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ec4615e84c716a8145cc2eb23ffce1a1cb252b3b19af4bc2ede902ad9d93b8f
-  data.tar.gz: 28203bd469d71e8c9ab0c294635ce190b11805b022857603d10a0d955d488ad1
+  metadata.gz: 220e70064255c62b8a08934d7f515ea38257e4bfa9017843ad6c833b064e321f
+  data.tar.gz: 01de55a62af0c4dd1a699bb968d80cf9e518c2a8b3026b01fd7262472dcd8c21
 SHA512:
-  metadata.gz: a9388a19f538d3c60b07bae725cf20bf8a42e6cd25a1aa3904d9b716717e938e0bec81b81933ceddabeb525e64393480fa5b88a85cabd1fc927574d8cad5a821
-  data.tar.gz: 4307463861177b312d58839e9dd011ddf832093a615b1014d929f1ccc265cc7feee4dc499de76d16838cac4658e2a56cd4ada513e69eaf488de9bc9e7e24e9fb
+  metadata.gz: 8e0325c8a2aa487600af752edd5a222a2ae06821404346f94a681717322957b3e8dc25ab7c2de5566638c9b175993339a0b5728c172b4302f40bef69e723929c
+  data.tar.gz: 8ccc09a94034687aaf8192724dcd6675977c4e4e3b6c9777fb10b74392dcd8dd25b9f3780ab2b664ec7c84c98c6396bcbb281d651871f2f664c14997411b63bd

data/lib/pechkin/app/app.rb

@@ -21,7 +21,7 @@ module Pechkin
       result = RequestHandler.new(handler, req, logger).handle
       response(200, result)
     rescue AppError => e
-      proces_app_error(req, e)
+      process_app_error(req, e)
     rescue StandardError => e
       process_unhandled_error(req, e)
     end
@@ -32,10 +32,15 @@ module Pechkin
       [code.to_s, DEFAULT_HEADERS.dup, [body.to_json]]
     end
 
-    def proces_app_error(req, err)
+    def process_app_error(req, err)
       data = { status: 'error', message: err.message }
-      req.body.rewind
-      body = req.body.read
+      if req.body
+        req.body.rewind
+        body = req.body.read
+      else
+        body = ''
+      end
+
       logger.error "Can't process message: #{err.message}. Body: '#{body}'"
       response(err.code, data)
     end

data/lib/pechkin/app/request_handler.rb

@@ -24,7 +24,7 @@ module Pechkin
 
       data = parse_data(req.body.read)
       # handler.handle() requires keyword arguments
-      handler.handle(channel_id, message_id, **data).each do |i|
+      handler.handle(channel_id, message_id, logger, **data).each do |i|
         logger.info "Sent #{channel_id}/#{message_id}: #{i.to_json}"
       end
     end

data/lib/pechkin/command/check.rb

@@ -1,3 +1,5 @@
+require_relative 'list'
+
 module Pechkin
   module Command
     # Check configuration consistency and exit.
@@ -7,7 +9,34 @@ module Pechkin
       end
 
       def execute
-        configuration # load configuration from disk and do nothing more
+        cfg = configuration # load configuration from disk
+
+        # If list option is also provided, print the channels
+        return unless options.list?
+
+        puts "Working dir: #{cfg.working_dir}"
+        print_bots(cfg.bots)
+        print_channels(cfg.channels)
+      end
+
+      private
+
+      def print_bots(bots)
+        puts "\nBots:"
+        puts format(BOT_ENTRY_FORMAT, 'NAME', 'CONNECTOR', 'TOKEN')
+        bots.each do |name, bot|
+          puts format(BOT_ENTRY_FORMAT, name, bot.connector, '*hidden*')
+        end
+      end
+
+      def print_channels(channels)
+        puts "\nChannels:"
+        puts format(CHAT_ENTRY_FORMAT, 'CHANNEL', 'MESSAGE', 'BOT')
+        channels.each do |channel_name, channel|
+          channel.messages.each_key do |message_name|
+            puts format(CHAT_ENTRY_FORMAT, channel_name, message_name, channel.connector.name)
+          end
+        end
       end
     end
   end

data/lib/pechkin/command/list.rb

@@ -1,7 +1,7 @@
 module Pechkin
   module Command
     BOT_ENTRY_FORMAT = '  %-25s   %-10s   %-60s '.freeze
-    CHAT_ENTRY_FORMAT = '  %-40s   %-40s   %-30s '.freeze
+    CHAT_ENTRY_FORMAT = '  %-60s   %-40s   %-30s '.freeze
 
     # List channels configuration
     class List < Base
@@ -31,7 +31,7 @@ module Pechkin
         puts "\nChannels:"
         puts format(CHAT_ENTRY_FORMAT, 'CHANNEL', 'MESSAGE', 'BOT')
         channels.each do |channel_name, channel|
-          channel.messages.each do |message_name, _message|
+          channel.messages.each_key do |message_name|
             puts format(CHAT_ENTRY_FORMAT,
                         channel_name, message_name, channel.connector.name)
           end

data/lib/pechkin/configuration/configuration_loader.rb

@@ -2,7 +2,7 @@ module Pechkin
   # Common code for all configuration loaders. To use this code just include
   # module in user class.
   module ConfigurationLoader
-    def check_field(object, field, file)
+    def fetch_field(object, field, file)
       contains = object.key?(field)
 
       raise ConfigurationError, "#{file}: '#{field}' is missing" unless contains
@@ -10,6 +10,18 @@ module Pechkin
       object[field]
     end
 
+    # Fetch token from environment variable defined in configuration file.
+    def fetch_value_from_env(object, token_field, file)
+      raise ConfigurationError, "#{file}: '#{token_field}' is missing in configuration" unless object.key?(token_field)
+
+      env_var = object[token_field]
+      token = ENV.fetch(env_var, nil)
+
+      raise ConfigurationError, "#{file}: environment var '#{token_field}' is missing" if token.to_s.strip.empty?
+
+      token
+    end
+
     def create_connector(bot)
       case bot.connector
       when 'tg', 'telegram'

data/lib/pechkin/configuration/configuration_loader_bots.rb

@@ -28,8 +28,8 @@ module Pechkin
     def load_bot_configuration(bot_file)
       bot_configuration = yaml_load(bot_file)
 
-      token = check_field(bot_configuration, 'token', bot_file)
-      connector = check_field(bot_configuration, 'connector', bot_file)
+      token = fetch_value_from_env(bot_configuration, 'token_env', bot_file)
+      connector = fetch_field(bot_configuration, 'connector', bot_file)
 
       Bot.new(token: token, connector: connector)
     end

data/lib/pechkin/configuration/configuration_loader_channels.rb

@@ -40,8 +40,8 @@ module Pechkin
 
       channel_config = yaml_load(channel_file)
 
-      bot = check_field(channel_config, 'bot', channel_file)
-      chat_ids = check_field(channel_config, 'chat_ids', channel_file)
+      bot = fetch_field(channel_config, 'bot', channel_file)
+      chat_ids = fetch_field(channel_config, 'chat_ids', channel_file)
       chat_ids = [chat_ids] unless chat_ids.is_a?(Array)
       messages = load_messages_configuration(channel_dir)
 

data/lib/pechkin/connector/base.rb

@@ -6,7 +6,7 @@ module Pechkin
         'Content-Type' => 'application/json; charset=UTF-8'
       }.freeze
 
-      def send_message(chat, message, message_desc); end
+      def send_message(chat, email, message, message_desc, logger); end
 
       def preview(chats, message, _message_desc)
         "Connector: #{self.class.name}; Chats: #{chats.join(', ')}\n" \

data/lib/pechkin/connector/slack.rb

@@ -1,5 +1,7 @@
 module Pechkin
   module Connector
+    class SlackApiRequestError < StandardError; end
+
     class Slack < Connector::Base # :nodoc:
       attr_reader :name
 
@@ -10,9 +12,35 @@ module Pechkin
         @name = name
       end
 
-      def send_message(channel, message, message_desc)
+      def resolve_user_id(email, logger)
+        url = "https://slack.com/api/users.lookupByEmail?email=#{email}"
+
+        uri = URI.parse(url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = url.start_with?('https://')
+
+        request = Net::HTTP::Get.new(uri.request_uri, @headers)
+
+        response = http.request(request)
+
+        if response.is_a?(Net::HTTPSuccess)
+          logger.warn "#{email}HTTPSuccess"
+          resp = JSON.parse(response.body)
+        else
+          logger.warn "#{email}Sending failed#{response.message}"
+          raise SlackApiRequestError, response.message
+        end
+
+        logger.warn "#{email} RESPONSE:#{resp['user']['id']}"
+
+        resp['user']['id']
+      end
+
+      def send_message(channel, email, message, message_desc, logger)
         text = CGI.unescape_html(message)
 
+        channel = resolve_user_id(email, logger) if channel == 'email'
+
         attachments = message_desc['slack_attachments'] || {}
 
         if text.strip.empty? && attachments.empty?
@@ -25,6 +53,8 @@ module Pechkin
         url = 'https://slack.com/api/chat.postMessage'
         response = post_data(url, params, headers: @headers)
 
+        logger.warn "#{email} RESPONSE: #{response.body}"
+
         { channel: channel, code: response.code.to_i, response: response.body }
       end
     end

data/lib/pechkin/connector/telegram.rb

@@ -10,7 +10,7 @@ module Pechkin
         @name = name
       end
 
-      def send_message(chat_id, message, message_desc)
+      def send_message(chat_id, _email, message, message_desc, _logger)
         options = { parse_mode: message_desc['telegram_parse_mode'] || 'HTML' }
         params = options.update(chat_id: chat_id, text: message)
 

data/lib/pechkin/handler.rb

@@ -26,14 +26,15 @@ module Pechkin
     # @param data [Object] data object to render via template. This is usualy
     #  deserialized json.
     # @see Configuration
-    def handle(channel_id, msg_id, data)
+    def handle(channel_id, msg_id, logger, data)
       channel_config, message_config, text =
         prepare_message(channel_id, msg_id, data)
       chats = channel_config.chat_ids
       connector = channel_config.connector
+      email = data['email']
 
       if message_allowed?(message_config, data)
-        chats.map { |chat| connector.send_message(chat, text, message_config) }
+        chats.map { |chat| connector.send_message(chat, email, text, message_config, logger) }
       else
         logger.warn "#{channel_id}/#{msg_id}: " \
                     "Skip sending message. Because it's not allowed"

data/lib/pechkin/version.rb

@@ -1,7 +1,7 @@
 module Pechkin
   # Keeps actual version
   module Version
-    VERSION = [2, 0, 2].freeze
+    VERSION = [2, 1, 0].freeze
     class << self
       def version_string
         VERSION.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pechkin
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Ilya Arkhanhelsky
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-02 00:00:00.000000000 Z
+date: 2025-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htauth
@@ -80,7 +80,7 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.0.9.1
-description: 
+description:
 email: ilya.arkhanhelsky at gmail.com
 executables:
 - pechkin
@@ -126,7 +126,7 @@ homepage: https://github.com/iarkhanhelsky/pechkin
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Web service to proxy webhooks to Telegram Bot API
 test_files: []