spior 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd8fdf3a383cf535c4e98ceee3ab95f728626fbb9b81ed93997c4a65ffa847d0
-  data.tar.gz: a0b374f2ef2511c764269ca2e799e25b8bd49b85aec840b86f7c88feaa977514
+  metadata.gz: 3b7a17588e2c9700a222a35e57fbb165ae2d12f54f4fa5779370e8219b29d104
+  data.tar.gz: 1316b42e62d0fcf5bb0cc4048a9168df1c158e6d45a5fb1d3f89c552d103a949
 SHA512:
-  metadata.gz: 5e237a0743b593406cd36b004c9a2e10951fa84aab9969d12054bf321808f0c40fac182b0ea2fa5719899939c0008cddd8cddc5c46a3f3b4cb8f2282243f194c
-  data.tar.gz: 18a8abe77ed421fedb39cc9d8eae8aed854703f639ec0db496c1482f6def234e5651343bf75ef6781478e2b4509f70fedb2bbd28967ee636377808e2a837a7cd
+  metadata.gz: f3ad900a13bd7f0118a739993328a6ad2e52ab79bbb3b2a7401333877a11c57f5c7e97b6c1460411e3252157b59ee350f055bfb76b5e8815dd4008770dfdef76
+  data.tar.gz: 011fd4db96c4cbf9c5f1fc99dbffab69c86b19cf88f47915377a822d86559c6f15c39eb9c905a6c87979c2736503846eeec6d02e65ccc803f544616eb2fc2320

data/CHANGELOG.md

@@ -1,4 +1,6 @@
 ### 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

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.2'
+  VERSION = '0.5.3'
 end

metadata

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