hrr_rb_lxns 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e3cc1b893875690893c0ac182dfcee29ffca9a81a57f045afd45cc14c1c6501
-  data.tar.gz: 92354baeca2cad1967283dd4da71bd9e94df231ab5b9d8d2315b878dbeb7f9e6
+  metadata.gz: e8243b5243363dd383204313c4487478786834e46ff9a3c1be7f90b2c5f77052
+  data.tar.gz: daa322824dc8a8c75a80213d37739b44e223a09647d73502c5b448b014629df1
 SHA512:
-  metadata.gz: 45dfd00ee670af333b10cd6600b98f021f4f6570c0f26ffe0def48f8fb384c3c24c65612d0f28feb15e0bb502a8ecd96d04a3592dbe5f0e5bbc34a2d64ac6632
-  data.tar.gz: 6c1880e6ff91a7dad30b59396ae1273a814c88006e2c68d3bd4f96580fb84dd68631ac89400418468ba49c3af2e2d7910823063cad668eccad0efc76c1644e3c
+  metadata.gz: 948f4793805ee19b20cd5da1fc1f9acff00c065829708bc9f1fb26e947917214e480b6ad8c86d955863dcb0e10a5413f335fa9270dcdf2c816f6ba0d4d2e12a6
+  data.tar.gz: 3a74b885cff6c12dcd179b6ee697d4e0da73f078f6dab6e3de8358e913ef0caa556ad104d05ff188eec848b3e804862fcb818e9da68cd7b0d64c59697347825b

data/Gemfile

@@ -2,6 +2,6 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rake", "~> 12.0"
+gem "rake", ">= 12.0"
 gem "rake-compiler"
 gem "rspec", "~> 3.0"

data/README.md

@@ -68,6 +68,15 @@ HrrRbLxns.setns HrrRbLxns::NEWUTS, pid # => 0
 File.readlink "/proc/self/ns/uts"      # => uts:[yyy]
 ```
 
+HrrRbLxns.setns can associate namespaces using files which specify namespaces, instead of specifying pid. The files are specified in an options hash. The keys which are available in the hash for each namespace are `:mount`, `:uts`, `:ipc`, `:network`, `:pid`, `:user`, `:cgroup`, and `:time`.
+
+```ruby
+# Create a network namespace using the ip netns command. The command generates "/run/netns/ns0" file, which is a bind-mounted namespace file.
+system "ip netns add ns0"
+# Then associate with the network namespace with specifying the file instead of pid.
+HrrRbLxns.setns HrrRbLxns::NETNET, nil, {network: "/run/netns/ns0"}
+```
+
 ## Note
 
 Some of the namespace operations are not multi-thread friendly. The library expects that only main thread is running before unshare or setns operation.

data/lib/hrr_rb_lxns.rb

@@ -58,7 +58,7 @@ module HrrRbLxns
   #   HrrRbLxns.setns HrrRbLxns::NEWUTS, pid # => 0
   #   File.readlink "/proc/self/ns/uts"      # => uts:[yyy]
   #
-  # @param flags [Integer] An integer value that represents namespaces to disassociate.
+  # @param flags [Integer] An integer value that represents namespaces to associate.
   # @param flags [String] A string that represents namespaces. The mapping of charactors and flags are: <br>
   #   "i" : NEWIPC <br>
   #   "m" : NEWNS <br>
@@ -68,21 +68,31 @@ module HrrRbLxns
   #   "U" : NEWUSER <br>
   #   "C" : NEWCGROUP <br>
   #   "T" : NEWTIME <br>
-  # @param options [Hash] For future use.
+  # @param pid [Integer] Specifies a target process('s namespace) which the caller is to associate with. The paths specifying namespaces specified by pid are: <br>
+  #   /proc/pid/ns/mnt :    mount namespace <br>
+  #   /proc/pid/ns/uts :    uts namespace <br>
+  #   /proc/pid/ns/ipc :    ipc namespace <br>
+  #   /proc/pid/ns/net :    network namespace <br>
+  #   /proc/pid/ns/pid :    pid namespace <br>
+  #   /proc/pid/ns/user :   user namespace <br>
+  #   /proc/pid/ns/cgroup : cgroup namespace <br>
+  #   /proc/pid/ns/time :   time namespace <br>
+  # @param options [Hash] Optional arguments.
+  # @option options [String] :mount   A file which specifies the mount namespace to associate with.
+  # @option options [String] :uts     A file which specifies the uts namespace to associate with.
+  # @option options [String] :ipc     A file which specifies the ipc namespace to associate with.
+  # @option options [String] :network A file which specifies the network namespace to associate with.
+  # @option options [String] :pid     A file which specifies the pid namespace to associate with.
+  # @option options [String] :user    A file which specifies the user namespace to associate with.
+  # @option options [String] :cgroup  A file which specifies the cgroup namespace to associate with.
+  # @option options [String] :time    A file which specifies the time namespace to associate with.
   # @return [Integer] 0.
-  # @raise [ArgumentError] When given flags argument is not appropriate.
+  # @raise [ArgumentError] When given flags argument is not appropriate or when given pid and/or options are not appropriate for the given flags.
   # @raise [Errno::EXXX] In case setns(2) system call failed.
   def self.setns flags, pid, options={}
     _flags = interpret_flags flags
-    fds = get_fds _flags, pid
-    fds.each do |path, nstype|
-      begin
-        fd = File.open(path, File::RDONLY)
-        __setns__ fd.fileno, nstype
-      ensure
-        fd.close rescue nil
-      end
-    end
+    nstype_file_h = get_nstype_file_h _flags, pid, options
+    do_setns nstype_file_h
   end
 
   private
@@ -110,27 +120,41 @@ module HrrRbLxns
     end
   end
 
-  def self.get_fds flags, pid
+  def self.do_setns nstype_file_h
+    nstype_file_h.each do |nstype, file|
+      File.open(file, File::RDONLY) do |f|
+        __setns__ f.fileno, nstype
+      end
+    end
+  end
+
+  def self.get_nstype_file_h flags, pid, options
     list = Array.new
-    list.push ["ipc",    NEWIPC   ] if const_defined?(:NEWIPC)
-    list.push ["mnt",    NEWNS    ] if const_defined?(:NEWNS)
-    list.push ["net",    NEWNET   ] if const_defined?(:NEWNET)
-    list.push ["pid",    NEWPID   ] if const_defined?(:NEWPID)
-    list.push ["uts",    NEWUTS   ] if const_defined?(:NEWUTS)
-    list.push ["user",   NEWUSER  ] if const_defined?(:NEWUSER)
-    list.push ["cgroup", NEWCGROUP] if const_defined?(:NEWCGROUP)
-    list.push ["time",   NEWTIME  ] if const_defined?(:NEWTIME)
-    fds = Array.new
-    list.each do |name, flag|
-      fd = get_fd name, (flags & flag), pid
-      fds.push [fd, flag] if fd
+    list.push ["ipc",    NEWIPC,    :ipc    ] if const_defined?(:NEWIPC)
+    list.push ["mnt",    NEWNS,     :mount  ] if const_defined?(:NEWNS)
+    list.push ["net",    NEWNET,    :network] if const_defined?(:NEWNET)
+    list.push ["pid",    NEWPID,    :pid    ] if const_defined?(:NEWPID)
+    list.push ["uts",    NEWUTS,    :uts    ] if const_defined?(:NEWUTS)
+    list.push ["user",   NEWUSER,   :user   ] if const_defined?(:NEWUSER)
+    list.push ["cgroup", NEWCGROUP, :cgroup ] if const_defined?(:NEWCGROUP)
+    list.push ["time",   NEWTIME,   :time   ] if const_defined?(:NEWTIME)
+    nstype_file_h = Hash.new
+    list.each do |name, flag, key|
+      file = get_file name, (flags & flag), pid, key, options[key]
+      nstype_file_h[flag] = file if file
     end
-    fds
+    nstype_file_h
   end
 
-  def self.get_fd name, flag, pid
-    if flag.zero?.! && pid
-      "/proc/#{pid}/ns/#{name}"
+  def self.get_file name, flag, pid, key, option
+    if flag.zero?.!
+      if option
+        option
+      elsif pid
+        "/proc/#{pid}/ns/#{name}"
+      else
+        raise ArgumentError, "neither pid nor options[:#{key}] specified for #{key} namespace"
+      end
     else
       nil
     end

data/lib/hrr_rb_lxns/version.rb

@@ -1,3 +1,3 @@
 module HrrRbLxns
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hrr_rb_lxns
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - hirura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-04-02 00:00:00.000000000 Z
 dependencies: []
 description: Utilities working with Linux namespaces for CRuby.
 email: