onlylogs 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4856715cec18b6f3e8bca4cd01d3d3de18c4a6286eea249239d4a61423db5107
-  data.tar.gz: c73534414629768100cf3be121e9a06c8a0cc6841bce942dc02ed31655581432
+  metadata.gz: 8f62d620f18a738931a2e17cdad1e30b4027210ffc69fc56d5eb281ea4569885
+  data.tar.gz: 3c6cb173191da7ed4a323d398961b7bbb26805e0a543e07de379c4d739eb3f88
 SHA512:
-  metadata.gz: d25035152f19a9711cfd0ce93a238162067d1a7a070971b06eebe023569645536a63358c89d0475fd0d4201f1327aac6fc1d9a44168166278dd886564e2a788b
-  data.tar.gz: 165b9455a35fc3f4e882995ca9201340e65c13ea6074214015b529b04c5add2a828d71e29a479ad127eef1f625f2619932aaf688aba803e57338b68fb3543532
+  metadata.gz: 0226e7b4af50b81e0d25d31c01ce3a7f5a66ad809875ba7a0e95fba772934ab2f9991a632091c3960ecfbcdd4bf35067ed197f55c8087dd2da45630e18f68531
+  data.tar.gz: 8d13b4f0f9f1b54c0cb9ce72640da13be0b365e951f5aac8b4126dc143b6785f27902c00492a6bc3b4c4357cb0f4ccd19442fdb2e906fe01c13c51fc6bc7c3d1

data/app/controllers/onlylogs/logs_controller.rb

@@ -2,8 +2,10 @@
 
 module Onlylogs
   class LogsController < ApplicationController
+    rescue_from(Onlylogs::ForbiddenPathError) { render plain: "Forbidden: you cannot open this log file.", status: :forbidden }
+
     def index
-      @available_log_files = Onlylogs.available_log_files
+      @available_log_files = Onlylogs.available_log_files.select { |file| authorized?(file.to_s) }
       @log_file_path = selected_log_file_path
     end
 
@@ -31,19 +33,21 @@ module Onlylogs
 
     def authorized_log_file_path(encrypted_path)
       decrypted_path = Onlylogs::SecureFilePath.decrypt(encrypted_path)
-      if Onlylogs.file_path_permitted?(decrypted_path)
-        decrypted_path
-      else
-        raise Onlylogs::ForbiddenPathError, "File path not allowed"
-      end
+      raise Onlylogs::ForbiddenPathError, "File path not allowed" unless authorized?(decrypted_path)
+
+      decrypted_path
+    end
+
+    # The same check the queries endpoints and the viewer use: the allow-list, then the host's hook.
+    def authorized?(path)
+      Onlylogs.file_path_permitted?(path) && Onlylogs.log_file_authorized?(self, path)
     end
 
     def default_log_file_path
-      # "/Users/alessandrorodi/RenuoWorkspace/onlylogs/test/fixtures/files/very_big.log"
       configured_default = Onlylogs.default_log_file_path
-      return configured_default if Onlylogs.file_path_permitted?(configured_default) && ::File.exist?(configured_default)
+      return configured_default if authorized?(configured_default) && ::File.exist?(configured_default)
 
-      @available_log_files.first&.to_s || configured_default
+      @available_log_files.first&.to_s
     end
   end
 end

data/app/models/onlylogs/grep.rb

@@ -53,13 +53,13 @@ module Onlylogs
         query: pattern, regexp: regexp_mode, case_sensitive: case_sensitive, start_position: start_position,
         end_position: end_position, max_matches: max_matches) do |payload|
         each_output_line(command_args, timeout: timeout) do |line|
-          line = line.chomp
+          line = line.scrub.chomp
           next if context.positive? && line == GROUP_SEPARATOR
 
           byte_offset, content, context_line = parse_line.call(line)
 
           # Use String.new to create a copy and prevent memory retention from IO buffers
-          content = String.new(content, encoding: Encoding::UTF_8).scrub
+          content = String.new(content, encoding: Encoding::UTF_8)
 
           result = {byte_offset: byte_offset, content: content}
           result[:context] = true if context_line

data/app/views/onlylogs/logs/index.html.erb

@@ -38,6 +38,11 @@
     .download-link:hover {
         background-color: #d7e5fd;
     }
+
+    .no-log-files {
+        padding: 0.65rem;
+        color: #58626f;
+    }
 </style>
 <div class="grid">
   <div class="grid-header">
@@ -56,5 +61,9 @@
       <% end %>
     <% end %>
   </div>
-  <%= render partial: "onlylogs/shared/log_container", locals: { log_file_path: @log_file_path } %>
+  <% if @log_file_path %>
+    <%= render partial: "onlylogs/shared/log_container", locals: { log_file_path: @log_file_path } %>
+  <% else %>
+    <p class="no-log-files">No log files you can open.</p>
+  <% end %>
 </div>

data/bin/onlylogs_sidecar

@@ -70,7 +70,6 @@ def send_batch(uri, lines)
   http.use_ssl = (uri.scheme == "https")
   request = Net::HTTP::Post.new(uri.path)
   request.body = lines.join("\n")
-  puts "[OnlylogsSidecar] Sending #{request.body}"
   request.content_type = "text/plain"
   http.read_timeout = 5
   http.open_timeout = 2

data/bin/super_grep

@@ -60,7 +60,8 @@ query_regex="${query_regex//$placeholder/$actual_color_regex}"
 
 
 # Build grep command
-grep_cmd=(grep -E -h)             # -h = no filename (portable)
+# -a: a NUL byte makes grep take the file for binary and print "Binary file matches" instead of the lines
+grep_cmd=(grep -E -h -a)          # -h = no filename (portable)
 if [ -n "$max_matches" ]; then
   grep_cmd+=(-m "$max_matches")   # -m = max count (portable)
 fi
@@ -86,8 +87,8 @@ if [ -n "$start_position" ] || [ -n "$end_position" ]; then
   [ $range_end -gt $file_size ] && range_end=$file_size && range_size=$((range_end - range_start))
 
   tail -c +$((range_start + 1)) "$file" | head -c $range_size | \
-    "${grep_cmd[@]}" "$query_regex"
+    "${grep_cmd[@]}" -e "$query_regex"
 else
-  # Search entire file
-  "${grep_cmd[@]}" "$query_regex" "$file"
+  # Search entire file. -e and -- keep a query or file that starts with "-" from being read as options.
+  "${grep_cmd[@]}" -e "$query_regex" -- "$file"
 fi

data/bin/super_ripgrep

@@ -68,7 +68,8 @@ query_regex="${query_regex//$placeholder/$actual_color_regex}"
 # charges those pages to the cgroup as active memory, which can trigger an OOM
 # kill. Plain read() pages are ordinary, readily-reclaimable page cache.
 # --byte-offset: include byte offset in output for the logs-around-line feature
-rg_cmd="rg --color=never --no-filename --byte-offset --no-mmap"
+# --text: a NUL byte makes ripgrep take the file for binary and stop printing matches from there on
+rg_cmd="rg --color=never --no-filename --byte-offset --no-mmap --text"
 [ -n "$max_matches" ] && rg_cmd="$rg_cmd --max-count=$max_matches"
 [ "$case_insensitive" = true ] && rg_cmd="$rg_cmd --ignore-case"
 # Context lines come out as "offset-line" instead of "offset:line", with "--" between groups

data/lib/onlylogs/version.rb

@@ -1,3 +1,3 @@
 module Onlylogs
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlylogs
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Alessandro Rodi