spior 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f09e5e9159a0fb30402fb03498f579fed190f4096664e5659436a5e152ec57f8
-  data.tar.gz: 5058d8c02c5534d6aecf005976f105b4aa34156fbdb93cc04b8f07acacafc663
+  metadata.gz: 3b7a17588e2c9700a222a35e57fbb165ae2d12f54f4fa5779370e8219b29d104
+  data.tar.gz: 1316b42e62d0fcf5bb0cc4048a9168df1c158e6d45a5fb1d3f89c552d103a949
 SHA512:
-  metadata.gz: d6eb6bc5d7e73d6042e391ca0545d365c006f8c33d33284bf7959bbb8f37984a98784c6b416a0c9e703867e8e3fe7cfc38d58a94393df49abd0ac5770603153d
-  data.tar.gz: 36be0d22c6a216a536b7a0a049817bac0b369dac3c4e128ce93b284972dc35e83f642428530fe7f9e2a7e49ac63ce057fd8e1927f600a0e6e5d5c26de8ef4640
+  metadata.gz: f3ad900a13bd7f0118a739993328a6ad2e52ab79bbb3b2a7401333877a11c57f5c7e97b6c1460411e3252157b59ee350f055bfb76b5e8815dd4008770dfdef76
+  data.tar.gz: 011fd4db96c4cbf9c5f1fc99dbffab69c86b19cf88f47915377a822d86559c6f15c39eb9c905a6c87979c2736503846eeec6d02e65ccc803f544616eb2fc2320

checksums.yaml.gz.sig

@@ -1 +1 @@
-\��d��Y�RN?c�Ay "Q�&��MY��W"��Dn��B�;8�81�k�ڕJ&���p�X���*�\&�d��?sB0Ã�8q�u�� v�x�|�$�PA��jP�6*uH�MW�!2a�w�b���*�v��������-����r*�p�u�<iu���%h�<���M�OOX�y���<��ڹ���Y�g��hq�������X�J
+7���-�� �r���j�����0�,kE]+�}����u�E
�p�}

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### Fix
+* sysctl no more generate blank line.
+* ipv6 - check if ipv6 is alrealy blocked before trying to allow or block.
+* config for tor and spior, not enough permission - now fixed at 0644.
+
 ## 0.5.0, release 2024-10
 * Correct runtime with openrc on Gentoo
 * Remove a lots of old codes.

data/lib/spior/helpers.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'tempfile'
 require 'open3'
 
+# Various function for Spior
 module Helpers
   def self.auth?
     return :root if Process.uid == '0'
@@ -33,8 +34,10 @@ module Helpers
   def self.mv(src, dest)
     if Process::Sys.getuid == '0'
       FileUtils.mv(src, dest)
+      FileUtils.chmod 0644, dest
     else
       cmd("mv #{src} #{dest}")
+      cmd("chmod 644 #{dest}")
     end
   end
 

data/lib/spior/ipv6.rb

@@ -8,21 +8,30 @@ module Spior
   class Ipv6
     def initialize
       @dest = '/etc/sysctl.d/40-ipv6.conf'
+      @cmdline_path = '/proc/cmdline'
+      @opened = false
+      collect_cmdline_args
       gen_flags
     end
 
     def allow
-      @flags.each { |f| Helpers.cmd("sysctl -w '#{f}=0'") }
+      return if check_ipv6_disabled?
+
+      @flags.each { |f| Helpers.cmd("sysctl -q -w '#{f}=0'") }
       Msg.p 'ipv6 allowed'
       Helpers.cmd("rm #{@dest}") if File.exist? @dest
     end
 
     def block
-      @flags.each { |f| Helpers.cmd("sysctl -w '#{f}=1'") }
+      return if check_ipv6_disabled?
+
+      @flags.each { |f| Helpers.cmd("sysctl -q -w '#{f}=1'") }
       Msg.p 'ipv6 blocked'
     end
 
     def block_persist
+      return if check_ipv6_disabled?
+
       Auth.new.mkdir '/etc/sysctl.d'
       myflags = []
       @flags.each { |f| myflags << "#{f}=1" }
@@ -37,5 +46,23 @@ module Spior
                 'net.ipv6.conf.default.disable_ipv6']
       Interfacez.all { |i| @flags << "net.ipv6.conf.#{i}.disable_ipv6" }
     end
+
+    def collect_cmdline_args
+      if !File.exist?(@cmdline_path) || !File.readable?(@cmdline_path)
+        @opened = false
+      else
+        @opened = true
+        @all_args = File.read(@cmdline_path)
+      end
+    end
+
+    def check_ipv6_disabled?
+      return false unless @opened
+
+      @all_args.split.each do |a|
+        return true.to_s if a.match(/^ipv6.disable=1$/)
+      end
+      false
+    end
   end
 end

data/lib/spior/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Spior
-  VERSION = '0.5.1'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spior
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - szorfein
@@ -36,7 +36,7 @@ cert_chain:
   urXgRIzALxd/xazPCnoLSXPzfJSI6Y77S1EBvhPd9RaSO8IyH9RhPDP9mnTvW2Kl
   NAUnoL+txK5a
   -----END CERTIFICATE-----
-date: 2024-10-10 00:00:00.000000000 Z
+date: 2024-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: interfacez