capng_c 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8fb8b88d94a62f191e40dd68b4ec9b2e8c088de2d58d11eee06acee1fccff5a
-  data.tar.gz: fef4a3cfb603eb2399453adb308b3e573e07916504c63ac93fd65caab4455f13
+  metadata.gz: '09424f043b085bf67c01b1b452d4a4f2fc7c60c1afc6c747b1c0d2fe6a993885'
+  data.tar.gz: 5ca5f2a6d6532d6a4a5e3101003790217704739be145c437194fbfc71f6bcd45
 SHA512:
-  metadata.gz: b9852afd96a5821ec3133c8b72c783af1ea0a5a5cf85645a9491335a76d8eb03e50e170abec25b9e18255a66952bb1ae2aef4505d883981dd7a928f2c8f83be3
-  data.tar.gz: 4d4ea024e06ce6d55276bc4e87b227836a7eab13d75417e457ab1adec6cf4042e7f0a8b39494f484f164681fb46704eaeebf15aa5fd06e75d92aa7a73ec2f4f2
+  metadata.gz: 8f3a2e7470baece0fe2b391a9b90f798b5a3eb1ba57327793212bc4fcfaaf419316dd42e7d08ac616705495dfcf33097dcaa6060cfaa256f2e3428ebfddb50bd
+  data.tar.gz: e9fdef39ef5ae17e7f825cf3fea0cbc45a27345eecd7790d95eb0e90d2b83fc63d759bd57bb3081e32493f41175954db86f9d5f7f2a0830ba0c818ebc78c0954

data/example/file_capability.rb

@@ -25,7 +25,8 @@ if Process.uid != 0
 end
 
 path = ARGV[0]
-capng = CapNG.new(:file, path)
+capng = CapNG.new
+capng.caps_file(path)
 print = CapNG::Print.new
 puts "capability: #{print.caps_text(:buffer, :effective)}"
 capng.clear(:caps)

data/ext/capng/capng.c

@@ -33,12 +33,6 @@
  *  @capng = CapNG.new(:other_process, 12345)
  *  @capng.have_capability?(:effective, :dac_override)
  *
- * @example
- *  # File capability example
- *  require 'capng'
- *
- *  @capng = CapNG.new(:file, "/path/to/file")
- *  @capng.have_capability?(:effective, :chown)
  */
 /* clang-format on */
 
@@ -85,13 +79,12 @@ rb_capng_alloc(VALUE klass)
 static VALUE
 rb_capng_initialize(int argc, VALUE* argv, VALUE self)
 {
-  VALUE rb_target, rb_pid_or_file;
+  VALUE rb_target, rb_pid;
   int result = 0;
   char* target = NULL;
-  int pid = 0, fd = 0;
-  rb_io_t* fptr = NULL;
+  int pid = 0;
 
-  rb_scan_args(argc, argv, "02", &rb_target, &rb_pid_or_file);
+  rb_scan_args(argc, argv, "02", &rb_target, &rb_pid);
 
   if (NIL_P(rb_target)) {
     return Qnil;
@@ -111,40 +104,19 @@ rb_capng_initialize(int argc, VALUE* argv, VALUE self)
       rb_raise(rb_eRuntimeError, "Couldn't get current process' capability");
     }
   } else if (strcmp(target, "other_process") == 0) {
-    Check_Type(rb_pid_or_file, T_FIXNUM);
+    Check_Type(rb_pid, T_FIXNUM);
 
-    pid = NUM2INT(rb_pid_or_file);
+    pid = NUM2INT(rb_pid);
     capng_setpid(pid);
     result = capng_get_caps_process();
     if (result != 0) {
       rb_raise(rb_eRuntimeError, "Couldn't get current process' capability");
     }
-  } else if (strcmp(target, "file") == 0) {
-    Check_Type(rb_pid_or_file, T_FILE);
-
-    fptr = RFILE(rb_pid_or_file)->fptr;
-    fd = fptr->fd;
-    result = capng_get_caps_fd(fd);
-    /* Just store result into instance variable. */
-    /* This is because capng_get_caps_fd should return 0 if file cap is not set. */
-    rb_iv_set(self, "@return_code", INT2NUM(result));
   }
 
   return Qnil;
 }
 
-/*
- * Retrieve capability API status code on [CapNG#initialize] and file capability target.
- *
- * @return [@return_code]
- *
- */
-static VALUE
-rb_capng_return_code(VALUE self)
-{
-  return rb_iv_get(self, "@return_code");
-}
-
 /*
  * Clear capabilities on specified target.
  *
@@ -269,7 +241,7 @@ rb_capng_update(VALUE self, VALUE rb_action_name_or_action,
                 VALUE rb_capability_name_or_type, VALUE rb_capability_or_name)
 {
   int result = 0;
-  unsigned int capability = 0;
+  int capability = 0;
   capng_type_t capability_type = 0;
   capng_act_t action = 0;
 
@@ -310,10 +282,18 @@ rb_capng_update(VALUE self, VALUE rb_action_name_or_action,
     case T_SYMBOL:
       capability =
         capng_name_to_capability(RSTRING_PTR(rb_sym2str(rb_capability_or_name)));
+      if (capability == -1) {
+        rb_raise(rb_eRuntimeError, "Unknown capability: %s",
+                 RSTRING_PTR(rb_sym2str(rb_capability_or_name)));
+      }
       break;
     case T_STRING:
       capability = capng_name_to_capability(StringValuePtr(rb_capability_or_name));
-      break;
+      if (capability == -1) {
+        rb_raise(rb_eRuntimeError, "Unknown capability: %s",
+                 StringValuePtr(rb_capability_or_name));
+      }
+     break;
     case T_FIXNUM:
       capability = NUM2INT(rb_capability_or_name);
       break;
@@ -575,7 +555,6 @@ Init_capng(void)
   rb_define_alloc_func(rb_cCapNG, rb_capng_alloc);
 
   rb_define_method(rb_cCapNG, "initialize", rb_capng_initialize, -1);
-  rb_define_method(rb_cCapNG, "return_code", rb_capng_return_code, 0);
   rb_define_method(rb_cCapNG, "clear", rb_capng_clear, 1);
   rb_define_method(rb_cCapNG, "fill", rb_capng_fill, 1);
   rb_define_method(rb_cCapNG, "setpid", rb_capng_setpid, 1);

data/lib/capng.rb

@@ -14,21 +14,6 @@ class CapNG
   # :nodoc:
   # @private
   alias_method :update_raw, :update
-  # :nodoc:
-  # @private
-  alias_method :initialize_raw, :initialize
-
-  def initialize(target = nil, pid_or_path = nil)
-    if target && pid_or_path.is_a?(Integer)
-      initialize_raw(target, pid_or_path)
-    elsif target && pid_or_path.is_a?(String) && File.exist?(pid_or_path)
-      File.open(pid_or_path) do |file|
-        initialize_raw(target, file);
-      end
-    else
-      initialize_raw(target, pid_or_path)
-    end
-  end
 
   def caps_file(file_or_string_path)
     if file_or_string_path.is_a?(String) && File.exist?(file_or_string_path)

data/lib/capng/version.rb

@@ -1,3 +1,3 @@
 class CapNG
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capng_c
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Hiroshi Hatake
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-09 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler