runit-man 2.2.4 → 2.2.5

data/i18n/en.yml

@@ -4,6 +4,8 @@ en:
     title: "%{p1} - %{p2}"
     header: "%{p1}: %{p2}"
     error: Error encountered while accessing resource
+    errors:
+      invalid_encoding: "File contains octets that cannot be parsed as UTF-8 character sequences."
     loading: "Please wait while loading…"
     footer: "State of services updated automatically every %{sec} seconds."
     services:

data/i18n/ru.yml

@@ -4,6 +4,8 @@ ru:
     title: "%{p1} - %{p2}"
     header: "%{p1}: %{p2}"
     error: Ошибка обращения к ресурсу
+    errors:
+      invalid_encoding: "Файл содержит октеты, которые не получается распознать как символьные последовательности UTF-8."
     loading: "Идёт загрузка…"
     footer: "Состояние сервисов обновляется автоматически каждые %{sec} секунд."
     services:

data/lib/runit-man/app.rb

@@ -123,12 +123,20 @@ class RunitMan < Sinatra::Base
     srv   = ServiceInfo[name]
     return nil if srv.nil? || !srv.logged?
     text = ''
-    text.force_encoding('utf-8') if text.respond_to?(:force_encoding)
-    File::Tail::Logfile.open(srv.log_file_location, :backward => count, :return_if_eof => true) do |log|
-      log.tail do |line|
-        line.force_encoding('utf-8') if line.respond_to?(:force_encoding)
-        text += line
+    begin
+      text.force_encoding('utf-8') if text.respond_to?(:force_encoding)
+      File::Tail::Logfile.open(srv.log_file_location, :backward => count, :return_if_eof => true) do |log|
+        log.tail do |line|
+          if line.respond_to?(:force_encoding)
+            line.force_encoding('utf-8')
+            raise ArgumentError.new('wrong encoding') unless line.valid_encoding?
+          end
+          line.force_encoding('utf-8') if line.respond_to?(:force_encoding)
+          text += line
+        end
       end
+    rescue ArgumentError
+      text = I18n.t('runit.errors.invalid_encoding')
     end
 
     {
@@ -139,6 +147,25 @@ class RunitMan < Sinatra::Base
     }
   end
 
+  def data_of_file_view(request)
+    if !request.GET.has_key?('file')
+      return nil
+    end
+    file_path = request.GET['file']
+    return nil unless all_files_to_view.include?(file_path)
+    text = IO.read(file_path)
+    begin
+      text.force_encoding('utf-8') if text.respond_to?(:force_encoding)
+      raise ArgumentError.new('wrong encoding') unless text.valid_encoding?
+    rescue ArgumentError
+      text = I18n.t('runit.errors.invalid_encoding')
+    end
+    {
+       :name => file_path,
+       :text => text
+    }
+  end
+
   get %r[^/([^/]+)/log(?:/(\d+))?/?$] do |name, count|
     data = log_of_service(name, count)
     return not_found if data.nil?
@@ -169,20 +196,6 @@ class RunitMan < Sinatra::Base
     data[:text]
   end
 
-  def data_of_file_view(request)
-    if !request.GET.has_key?('file')
-      return nil
-    end
-    file_path = request.GET['file']
-    return nil unless all_files_to_view.include?(file_path)
-    text = IO.read(file_path)
-    text.force_encoding('utf-8') if text.respond_to?(:force_encoding)
-    {
-       :name => file_path,
-       :text => text
-    }
-  end
-
   get '/view' do
     data = data_of_file_view(request)
     if data.nil?

data/lib/runit-man/version.rb

@@ -1,4 +1,4 @@
 module RunitManVersion
-  VERSION = '2.2.4'.freeze
+  VERSION = '2.2.5'.freeze
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 2
-  - 4
-  version: 2.2.4
+  - 5
+  version: 2.2.5
 platform: ruby
 authors: 
 - Akzhan Abdulin