junos-ez-stdlib 0.0.11 → 0.0.12

data/CHANGELOG.md

@@ -1,11 +1,19 @@
 # 2013-April
 
-  - 0.0.10: 2013-04-29
+  0.0.10: 2013-04-29
   
-    Initial release of code into RubyGems.  Code tested on EX and SRX-branch.  Consider this code
+    Initial release of code into RubyGems.  Code tested on EX and SRX-branch. Consider this code
     as "early-adopter".  Comments/feedback is welcome and appreciated.
+
+  0.0.11: 2013-04-29
+  
+    Updated Junos::Ez::RE::Utils
+      #memory changed :procs from Hash to Array  
+      #users changed return from Hash to Array
     
-  - 0.0.11: 2013-04-29
+  0.0.12: 2013-04-29 (In-Progress)
   
-    Updated Junos::Ez::RE::Utils.  #memory changed :procs from Hash to Array.  #users changed return from Hash to Array
+    Updated Junos::Ez::FS:Utils#ls to include :symlink information
+    Adding Junos::Ez::Users::Provider for login management
+    Adding Junos::Ez::UserAuths::Provider for SSH-key management
     

data/docs/Facts.md

@@ -42,8 +42,8 @@ Junos::Ez::Provider( ndev )
 # do a quick dump of all facts
 
 pp ndev.facts.catalog
-
--> {:hardwaremodel=>"SRX210H",
+-> 
+{:hardwaremodel=>"SRX210H",
  :serialnumber=>"AD2909AA0096",
  :hostname=>"srx210",
  :domain=>"",

data/docs/Providers_Resources.md

@@ -27,14 +27,14 @@ end
 # any L2port resource
 
 pp port.properties
-
--> [:_exist, :_active, :description, :untagged_vlan, :tagged_vlans, :vlan_tagging]
+-> 
+[:_exist, :_active, :description, :untagged_vlan, :tagged_vlans, :vlan_tagging]
 
 # now look at the specific values for this resource by pp the assocaite hash
 
 pp port.to_h
-
--> {"ge-0/0/0"=>
+-> 
+{"ge-0/0/0"=>
   {:_active=>true,
    :_exist=>true,
    :vlan_tagging=>true,
@@ -70,8 +70,8 @@ You can obtain the entire `@has` property hash has using the `to_h` method.  Thi
 port = ndev.l1_ports["ge-0/0/1"]
 
 pp port.to_h
-
--> {"ge-0/0/1"=>
+-> 
+{"ge-0/0/1"=>
   {:_active=>true,
    :_exist=>true,
    :admin=>:up,
@@ -85,12 +85,10 @@ You can also obtain just a specific property using the `[]` operator:
 
 ```ruby
 pp port[:admin]
-
--> :up
+-> 
+:up
 ```
 
-
-
 ## Modifying Properties
 
 Modifying the resource property is simply making use of the `[]=` operator.  For example,
@@ -108,8 +106,8 @@ You can also obtain the `@should` property hash using the `to_h` method and prov
 port[:admin] = :down
 
 pp port.to_h( :write )
-
--> {"ge-0/0/1"=>{:admin=>:down}}
+-> 
+{"ge-0/0/1"=>{:admin=>:down}}
 ```
 
 _NOTE: The `@should` property hash only contains the changes that will be applied, not every property value._
@@ -216,8 +214,8 @@ When you bind providers to a netconf object, you can always get a list of what e
 
 ```ruby
 pp ndev.providers
-
--> [:l1_ports, :ip_ports, :l2_ports]
+-> 
+[:l1_ports, :ip_ports, :l2_ports]
 ```
 
 ## Resource List
@@ -230,8 +228,8 @@ use `list!` unless you need to force the cache update.
 
 ```ruby
 pp ndev.l2_ports.list
-
--> ["fe-0/0/2", "fe-0/0/3", "fe-0/0/6"]
+-> 
+["fe-0/0/2", "fe-0/0/3", "fe-0/0/6"]
 ```
 
 ## Resource Catalog
@@ -242,8 +240,8 @@ work the same as described in the list section above.
 
 ```ruby
 pp ndev.l2_ports.catalog
-
--> {"fe-0/0/2"=>
+-> 
+{"fe-0/0/2"=>
   {:_active=>true,
    :_exist=>true,
    :vlan_tagging=>true,

data/docs/Users.md

@@ -0,0 +1,105 @@
+# Junos::Ez::Users::Provider
+
+Manages the on-target configured users, located under Junos `[edit system login]` stanza. 
+
+# PROPERTIES
+
+  - `:class` - String, The user priviledge class (like "read-only", or "super-user")
+  - `:uid` - Number, User ID (unix).  If not provided, Junos will auto-create
+  - `:fullname` - String, User Full Name
+  - `:password` - Junos encrypted password
+  - `:ssh_keys` - SSH keys (READ/ONLY)
+
+If you need to modify the user's ssh-keys, see the `load_ssh_key!` method in the next section.
+
+# RESOURCE METHODS
+
+## password=
+
+Used to set the user password by providing a plain-text value.
+```ruby
+
+Junos::Ez::User::Provider( ndev, :users )
+
+pp ndev.users.list
+-> 
+["goofy", "jeremy"]
+
+user = ndev.users["goofy"]
+user.to_h
+-> 
+{"goofy"=>
+  {:_active=>true,
+   :_exist=>true,
+   :uid=>"3000",
+   :class=>"read-only",
+   :password=>"XRykM8Grm0R0A"}}
+
+# set the password with plaintext value, then re-read the config from the device
+user.password = "n3wpassw0rd"
+user.read!
+
+user.to_h
+->
+{"goofy"=>
+  {:_active=>true,
+   :_exist=>true,
+   :uid=>"3000",
+   :class=>"read-only",
+   :password=>"W05ckLnjLcPCk"}}
+```
+## load_ssh_key!( :opts = {} )
+
+    opts[:publickey] - String of public-key
+    opts[:filename] - String, filename on server to public-key file
+
+This method will create an ssh-key for the user based on the contents of the provided public key.  The key will be written to the device, but not committed (just like resource write!).  The `Junos::Ez::UserAuths::Provider` resource for this key will be returned.
+
+```ruby
+user = ndev.users["jeremy"]
+pp user.to_h
+->
+{"jeremy"=>
+  {:_active=>true,
+   :_exist=>true,
+   :uid=>"2008",
+   :class=>"super-user",
+   :password=>"$1$JhZms6TE$dXF8P1ey1u3G.5j/V9FBk0"}}
+
+# write the key and then re-load user object
+user.load_ssh_key! :filename=>'/home/jschulman/.ssh/keys/key1.pub'
+user.read!
+pp user.to_h
+->
+{"jeremy"=>
+  {:_active=>true,
+   :_exist=>true,
+   :uid=>"2008",
+   :class=>"super-user",
+   :password=>"$1$JhZms6TE$dXF8P1ey1u3G.5j/V9FBk0",
+   :ssh_keys=>
+    {"ssh-rsa"=>
+      ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIpOXEUJFfHstdDjVEaTIf5YkTbUliSel6/dsNe"]}}}
+```
+## ssh_key( keytype, index = 0 )
+    keytype: ['ssh-rsa', 'ssh-dsa']
+
+This method will return a formulate name Hash for the specified key.  This name can then be used in conjunction 
+with the `Junos::Ez::UserAuth::Provider` class.
+
+The `index` parameter is used to select a key in the event that there is more than one in use.
+
+```ruby
+key_name = user.ssh_key( 'ssh-rsa' )
+->
+{:user=>"jeremy",
+ :keytype=>"ssh-rsa",
+ :publickey=>
+  "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIpOXEUJFfHstdDjVEaTIf5YkTbUliSel6/dsNe"}
+
+# bind :auths as so we can directly access ssh-keys ...
+Junos::Ez::UserAuths::Provider( ndev, :auths )
+
+# now delete the key from the user.
+ndev.auths[ key_name ].delete!
+```

data/examples/user.rb

@@ -0,0 +1,32 @@
+require 'pry'
+require 'yaml'
+require 'net/netconf/jnpr'
+require 'junos-ez/stdlib'
+require 'junos-ez/srx'
+
+unless ARGV[0]
+  puts "You must specify a target"
+  exit 1
+end
+
+# login information for NETCONF session 
+login = { :target => ARGV[0], :username => 'jeremy',  :password => 'jeremy1',  }
+
+## create a NETCONF object to manage the device and open the connection ...
+
+ndev = Netconf::SSH.new( login )
+$stdout.print "Connecting to device #{login[:target]} ... "
+ndev.open
+$stdout.puts "OK!"
+
+Junos::Ez::Provider( ndev )
+Junos::Ez::Users::Provider( ndev, :users )
+Junos::Ez::UserAuths::Provider( ndev, :sshkeys )
+Junos::Ez::Config::Utils( ndev, :cu )
+
+user = ndev.users["jeremy"]
+user.load_ssh_key! :filename=>'/home/jschulman/.ssh/keys/key1.pub'
+
+binding.pry
+
+ndev.close

data/lib/junos-ez/provider.rb

@@ -9,7 +9,7 @@ module Junos; end
   
 module Junos::Ez
   
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
   
   ### ---------------------------------------------------------------
   ### rpc_errors - decodes the XML into an array of error/Hash

data/lib/junos-ez/system.rb

@@ -1,59 +1,9 @@
 
 require "junos-ez/provider"
-
-### -----------------------------------------------------------------
-### manage static host entries, kinda like "/etc/hosts"
-### -----------------------------------------------------------------
-
-module Junos::Ez::StaticHosts
-  
-  PROPERTIES = [
-    :ip,                    # ipv4 address :String
-    :ip6,                   # ipv6 address :String
-  ]
-  
-  def self.Provider( ndev, varsym )            
-    newbie = Junos::Ez::StaticHosts::Provider.new( ndev )      
-    newbie.properties = Junos::Ez::Provider::PROPERTIES + PROPERTIES
-    Junos::Ez::Provider.attach_instance_variable( ndev, varsym, newbie )    
-  end  
-  
-  class Provider < Junos::Ez::Provider::Parent
-  end
-  
-end
-
 require 'junos-ez/system/st_hosts'
-
-### -----------------------------------------------------------------
-### manage static route entries
-### -----------------------------------------------------------------
-
-module Junos::Ez::StaticRoutes
-  
-    PROPERTIES = [
-      :gateway,             # next-hop gateway, could be single or Array
-      :metric,              # number or nil
-      :action,              # one-of [ :reject, :discard, :receive ]
-      :active,              # flag [ true, nil | false ]
-      :retain,              # no-flag [ nil, true, false ]
-      :install,             # no-flag [ nil, true, false ]
-      :readvertise,         # no-flag [ nil, true, false ]
-      :resolve,             # no-flag [ nil, true, false ]
-    ]
-    
-  def self.Provider( ndev, varsym )            
-    newbie = Junos::Ez::StaticRoutes::Provider.new( ndev )      
-    newbie.properties = Junos::Ez::Provider::PROPERTIES + PROPERTIES
-    Junos::Ez::Provider.attach_instance_variable( ndev, varsym, newbie )    
-  end  
-  
-  class Provider < Junos::Ez::Provider::Parent
-  end
-    
-end
-
 require 'junos-ez/system/st_routes'
+require 'junos-ez/system/users'
+require 'junos-ez/system/userauths'
 
 ### -----------------------------------------------------------------
 ### the 'syscfg' is a work in progress, do not use ...

data/lib/junos-ez/system/st_hosts.rb

@@ -1,3 +1,21 @@
+module Junos::Ez::StaticHosts
+  
+  PROPERTIES = [
+    :ip,                    # ipv4 address :String
+    :ip6,                   # ipv6 address :String
+  ]
+  
+  def self.Provider( ndev, varsym )            
+    newbie = Junos::Ez::StaticHosts::Provider.new( ndev )      
+    newbie.properties = Junos::Ez::Provider::PROPERTIES + PROPERTIES
+    Junos::Ez::Provider.attach_instance_variable( ndev, varsym, newbie )    
+  end  
+  
+  class Provider < Junos::Ez::Provider::Parent
+  end
+  
+end
+
 class Junos::Ez::StaticHosts::Provider
   
   ### ---------------------------------------------------------------

data/lib/junos-ez/system/st_routes.rb

@@ -1,3 +1,27 @@
+module Junos::Ez::StaticRoutes
+  
+    PROPERTIES = [
+      :gateway,             # next-hop gateway, could be single or Array
+      :metric,              # number or nil
+      :action,              # one-of [ :reject, :discard, :receive ]
+      :active,              # flag [ true, nil | false ]
+      :retain,              # no-flag [ nil, true, false ]
+      :install,             # no-flag [ nil, true, false ]
+      :readvertise,         # no-flag [ nil, true, false ]
+      :resolve,             # no-flag [ nil, true, false ]
+    ]
+    
+  def self.Provider( ndev, varsym )            
+    newbie = Junos::Ez::StaticRoutes::Provider.new( ndev )      
+    newbie.properties = Junos::Ez::Provider::PROPERTIES + PROPERTIES
+    Junos::Ez::Provider.attach_instance_variable( ndev, varsym, newbie )    
+  end  
+  
+  class Provider < Junos::Ez::Provider::Parent
+  end
+    
+end
+
 class Junos::Ez::StaticRoutes::Provider
   
   ### ---------------------------------------------------------------

data/lib/junos-ez/system/user_ssh_keys.rb

@@ -0,0 +1,113 @@
+=begin
+* Puppet Module  : junos-stdlib
+* Author         : Jeremy Schulman
+* File           : junos_user.rb
+* Version        : 2013-03-20
+* Platform       : All
+* Description    : 
+*
+*
+* Copyright (c) 2013  Juniper Networks. All Rights Reserved.
+*
+* YOU MUST ACCEPT THE TERMS OF THIS DISCLAIMER TO USE THIS SOFTWARE, 
+* IN ADDITION TO ANY OTHER LICENSES AND TERMS REQUIRED BY JUNIPER NETWORKS.
+* 
+* JUNIPER IS WILLING TO MAKE THE INCLUDED SCRIPTING SOFTWARE AVAILABLE TO YOU
+* ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN THIS
+* DISCLAIMER. PLEASE READ THE TERMS AND CONDITIONS OF THIS DISCLAIMER
+* CAREFULLY.
+*
+* THE SOFTWARE CONTAINED IN THIS FILE IS PROVIDED "AS IS." JUNIPER MAKES NO
+* WARRANTIES OF ANY KIND WHATSOEVER WITH RESPECT TO SOFTWARE. ALL EXPRESS OR
+* IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY WARRANTY
+* OF NON-INFRINGEMENT OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR A
+* PARTICULAR PURPOSE, ARE HEREBY DISCLAIMED AND EXCLUDED TO THE EXTENT
+* ALLOWED BY APPLICABLE LAW.
+*
+* IN NO EVENT WILL JUNIPER BE LIABLE FOR ANY DIRECT OR INDIRECT DAMAGES, 
+* INCLUDING BUT NOT LIMITED TO LOST REVENUE, PROFIT OR DATA, OR
+* FOR DIRECT, SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES
+* HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY ARISING OUT OF THE 
+* USE OF OR INABILITY TO USE THE SOFTWARE, EVEN IF JUNIPER HAS BEEN ADVISED OF 
+* THE POSSIBILITY OF SUCH DAMAGES.
+=end
+
+require 'puppet/provider/junos/junos_parent'
+
+class Puppet::Provider::Junos::SSH_auth_key < Puppet::Provider::Junos
+  
+  ### --------------------------------------------------------------------
+  ### triggered by provider #exists? 
+  ### --------------------------------------------------------------------  
+  
+  def netdev_res_exists?     
+    
+    # cannot manage the 'active' parameter from the puppet manifest since the
+    # type definition is compiled on the server, and doesn't include this :-(
+    # so fake it here, set to true always.  this way if someone deactivated
+    # it apriori, then this puppet-run will make it active again.
+
+    return false unless (auth = get_junos_config)
+
+    got_key = auth.text.strip
+    got_key_skip = got_key.index(' ') + 1
+    got_key = got_key[ got_key_skip .. -1 ]
+    
+    @ndev_res[:key] = got_key
+    @ndev_res[:user] = resource[:user]
+    @ndev_res[:type] = resource[:type]
+    @ndev_res[:target] = resource[:target]
+    @ndev_res[:options] = resource[:options]
+    
+    return true    
+  end   
+  
+  ### ---------------------------------  
+  ### ---> override parent method <----
+  ### ---------------------------------
+  
+  def netdev_resxml_top( xml )
+    xml.user {
+      xml.name resource[:user]
+      xml.authentication {
+        xml.send(:'ssh-rsa') {
+          xml.name 'ssh-rsa ' + resource[:key]
+          return xml
+        }
+      }
+    }    
+  end  
+  
+  def get_junos_config
+    
+    @ndev_res ||= NetdevJunos::Resource.new( self, 'system/login', 'user' )   
+    @ndev_res[:unmanaged_active] = true
+    
+    return nil unless (ndev_config = @ndev_res.getconfig)    
+    return nil unless auth_config = ndev_config.xpath("//user/authentication/ssh-rsa")[0]                  
+    @ndev_res.set_active_state( auth_config )        
+    
+    return auth_config        
+  end
+  
+  
+  ##### ------------------------------------------------------------
+  ##### XML builder routines, one for each property
+  ##### ------------------------------------------------------------   
+  
+  def xml_change_type( xml ) 
+  end
+
+  def xml_change_key( xml )
+  end
+
+  def xml_change_user( xml )
+  end
+
+  def xml_change_target( xml ) 
+  end
+
+  def xml_change_options( xml )
+  end
+
+end

data/lib/junos-ez/system/userauths.rb

@@ -0,0 +1,84 @@
+=begin
+=end
+
+module Junos::Ez::UserAuths
+  
+  VALID_KEY_TYPES = ['ssh-rsa','ssh-dsa']
+
+  def self.Provider( ndev, varsym )            
+    newbie = Junos::Ez::UserAuths::Provider.new( ndev )            
+    newbie.properties = Junos::Ez::Provider::PROPERTIES
+    Junos::Ez::Provider.attach_instance_variable( ndev, varsym, newbie )
+  end
+  
+  class Provider < Junos::Ez::Provider::Parent
+  end
+    
+end
+
+##### ---------------------------------------------------------------
+##### Resource Property Methods
+##### ---------------------------------------------------------------
+
+class Junos::Ez::UserAuths::Provider
+  
+  ### ---------------------------------------------------------------
+  ### XML top placement
+  ### ---------------------------------------------------------------
+  
+  def xml_at_top
+    Nokogiri::XML::Builder.new{|x| x.configuration{ 
+      x.system { x.login { x.user { 
+        x.name @name[:user]
+        x.authentication {          
+          x.send( @name[:keytype].to_sym ) {
+            x.name @name[:publickey]
+            return x
+          }
+        }
+      }}}
+    }}
+  end
+  
+  ### ---------------------------------------------------------------
+  ### XML readers
+  ### ---------------------------------------------------------------
+
+  def xml_get_has_xml( xml )
+    @should[:_active] = true              # mark it so it will write!    
+    xml.xpath('//user/authentication/*')[0]    
+  end
+        
+  def xml_read_parser( as_xml, as_hash )
+    set_has_status( as_xml, as_hash )
+  end    
+  
+  ### ---------------------------------------------------------------
+  ### XML writers
+  ### ---------------------------------------------------------------
+  
+  ## !! since we're not actually modifying any properties, we need
+  ## !! to overload the xml_build_change method to simply return
+  ## !! the config at-top (includes ssh name)
+  
+  def xml_build_change( xml_at_here = nil )
+    xml_at_top.doc.root
+  end  
+  
+end
+
+##### ---------------------------------------------------------------
+##### Provider Collection Methods
+##### ---------------------------------------------------------------
+
+class Junos::Ez::UserAuths::Provider
+  def build_list
+    []
+  end
+  
+  def build_catalog
+    {}
+  end
+end
+
+

data/lib/junos-ez/system/users.rb

@@ -0,0 +1,219 @@
+=begin
+=end
+
+require 'junos-ez/system/userauths'
+
+module Junos::Ez::Users
+
+  PROPERTIES = [ 
+    :uid,                     # User-ID, Number
+    :class,                   # User Class, String
+    :fullname,                # Full Name, String
+    :password,                # Encrypted password  
+    :ssh_keys,                # READ-ONLY, Hash of SSH public keys
+  ]  
+
+  def self.Provider( ndev, varsym )            
+    newbie = Junos::Ez::Users::Provider.new( ndev )            
+    newbie.properties = Junos::Ez::Provider::PROPERTIES + PROPERTIES
+    Junos::Ez::Provider.attach_instance_variable( ndev, varsym, newbie )
+  end
+  
+  class Provider < Junos::Ez::Provider::Parent; end
+    
+end
+
+
+##### ---------------------------------------------------------------
+##### Provider Resource Methods
+##### ---------------------------------------------------------------
+
+class Junos::Ez::Users::Provider 
+  
+  ### ---------------------------------------------------------------
+  ### XML top placement
+  ### ---------------------------------------------------------------
+  
+  def xml_at_top
+    Nokogiri::XML::Builder.new{|x| x.configuration{ 
+      x.system { x.login { x.user { 
+        x.name @name
+        return x
+    }}}}}
+  end
+
+  ### ---------------------------------------------------------------
+  ### XML readers
+  ### ---------------------------------------------------------------
+
+  def xml_get_has_xml( xml )
+    xml.xpath('//user')[0]    
+  end
+        
+  def xml_read_parser( as_xml, as_hash )
+    set_has_status( as_xml, as_hash )    
+    
+    as_hash[:uid] = as_xml.xpath('uid').text
+    as_hash[:class] = as_xml.xpath('class').text
+    
+    xml_when_item(as_xml.xpath('full-name')) {|i|
+      as_hash[:fullname] = i.text
+    }
+    
+    xml_when_item(as_xml.xpath('authentication/encrypted-password')) {|i|
+      as_hash[:password] = i.text
+    }
+  
+    # READ-ONLY capture the keys
+    unless (keys = as_xml.xpath('authentication/ssh-rsa')).empty?
+      @has[:ssh_keys] ||= {}
+      @has[:ssh_keys]['ssh-rsa'] = keys.collect{|key| key.text.strip}
+    end
+    unless (keys = as_xml.xpath('authentication/ssh-dsa')).empty?
+      @has[:ssh_keys] ||= {}      
+      @has[:ssh_keys]['ssh-dsa'] = keys.collect{|key| key.text.strip}
+    end
+  end  
+
+  ### ---------------------------------------------------------------    
+  ### XML writers
+  ### ---------------------------------------------------------------  
+  
+  def xml_change_password( xml )           
+    xml.authentication {
+      xml_set_or_delete( xml, 'encrypted-password', @should[:password] )
+    }
+  end
+  
+  def xml_change_fullname( xml )     
+    xml_set_or_delete( xml, 'full-name', @should[:fullname] )
+  end   
+  
+  # changing the 'gid' is changing the Junos 'class' element
+  # so, what is tough here is that the Nokogiri Builder mech
+  # won't allow us to use the string 'class' since it conflicts
+  # with the Ruby language.  So we need to add the 'class' element
+  # the hard way, yo! ...
+  
+  def xml_change_class( xml )  
+    par = xml.instance_variable_get(:@parent)    
+    doc = xml.instance_variable_get(:@doc)        
+    user_class = Nokogiri::XML::Node.new('class', doc )
+    user_class.content = @should[:class]
+    par.add_child( user_class )    
+  end    
+  
+  def xml_change_uid( xml )
+    xml_set_or_delete( xml, 'uid', @should[:uid] )
+  end
+  
+end
+
+##### ---------------------------------------------------------------
+##### Provider Collection Methods
+##### ---------------------------------------------------------------
+
+class Junos::Ez::Users::Provider
+  
+  def build_list
+    @ndev.rpc.get_configuration{ |x| x.system {
+      x.login {
+        x.user({:recurse => 'false'})
+      }
+    }}
+    .xpath('//user/name').collect{ |i| i.text }
+  end
+  
+  def build_catalog
+    @catalog = {}
+    @ndev.rpc.get_configuration{ |x| x.system {
+      x.login {
+        x.user
+      }
+    }}
+    .xpath('//user').each do |user|
+      name = user.xpath('name').text
+      @catalog[name] = {}
+      xml_read_parser( user, @catalog[name] )
+    end
+    @catalog
+  end
+  
+end
+
+##### ---------------------------------------------------------------
+##### Resource Methods
+##### ---------------------------------------------------------------
+
+class Junos::Ez::Users::Provider
+  
+  ## ----------------------------------------------------------------
+  ## change the password by providing it in plain-text
+  ## ----------------------------------------------------------------
+  
+  def password=(plain_text)
+    xml = xml_at_top
+    xml.authentication {
+      xml.send(:'plain-text-password-value', plain_text)
+    }
+    @ndev.rpc.load_configuration( xml )
+    return true
+  end
+  
+  ## ----------------------------------------------------------------
+  ## get a Hash that is used as the 'name' for obtaining a resource
+  ## for Junos::Ez::UserAuths::Provider
+  ## ----------------------------------------------------------------
+
+  def ssh_key( keytype, index = 0 )
+    return nil unless @has[:ssh_keys]
+    return nil unless @has[:ssh_keys][keytype]    
+    ret_h = {:user => @name, :keytype => keytype}
+    ret_h[:publickey] = @has[:ssh_keys][keytype][index]
+    ret_h
+  end
+  
+  ##
+  ## @@ need to move this code into the main provider
+  ## @@ as a utility  ...
+  ##
+  
+  def get_userauth_provd
+    @ndev.providers.each do |p|
+      obj = @ndev.send(p)
+      return obj if obj.class == Junos::Ez::UserAuths::Provider
+    end
+  end
+  
+  ## ----------------------------------------------------------------
+  ## load an SSH public key  & return the resulting key object.
+  ## You can provide the publickey either as :publickey or
+  ## contents will be read from :filename
+  ## ----------------------------------------------------------------
+
+  def load_ssh_key!( opts = {} )
+    publickey = opts[:publickey] || File.read( opts[:filename] ).strip
+    raise ArgumentError, "no public-key specified" unless publickey
+    
+    # nab the provider for handling ssh-keys, since we'll use that
+    # for key resource management
+    
+    @auth_provd ||= get_userauth_provd    
+    raise StandardError, "No Junos::Ez::UserAuths::Provider" unless @auth_provd
+    
+    # extract the key-type from the public key.
+    keytype = publickey[0..6]
+    keytype = 'ssh-dsa' if keytype == 'ssh-dss'
+    raise ArgumentError, "Unknown ssh key-type #{keytype}" unless Junos::Ez::UserAuths::VALID_KEY_TYPES.include? keytype
+    
+    # ok, we've got everything we need to add the key, so here we go.
+    key_name = {:user => @name, :keytype => keytype, :publickey => publickey }
+    key = @auth_provd[ key_name ]
+    key.write!
+    
+    # return the key in case the caller wants it
+    key
+  end
+  
+end
+

data/lib/junos-ez/utils/fs.rb

@@ -160,6 +160,10 @@ class Junos::Ez::FS::Provider < Junos::Ez::Provider::Parent
         f_h[:links] = file.xpath('file-links').text.to_i
         f_h[:size] = file.xpath('file-size').text.to_i
         
+        xml_when_item(file.xpath('file-symlink-target')) { |i|
+          f_h[:symlink] = i.text.strip
+        }
+        
         fp = file.xpath('file-permissions')[0]
         f_h[:permissions_text] = fp.attribute('format').value
         f_h[:permissions] = fp.text.to_i
@@ -172,7 +176,8 @@ class Junos::Ez::FS::Provider < Junos::Ez::Provider::Parent
       ls_hash[ dir_name ] = dir_hash        
     end # each directory
     
-    ls_hash      
+    return nil if ls_hash.empty?
+    ls_hash
   end # method: ls
   
   ### -------------------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: junos-ez-stdlib
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -57,6 +57,9 @@ files:
 - lib/junos-ez/system/st_hosts.rb
 - lib/junos-ez/system/st_routes.rb
 - lib/junos-ez/system/syscfg.rb
+- lib/junos-ez/system/userauths.rb
+- lib/junos-ez/system/users.rb
+- lib/junos-ez/system/user_ssh_keys.rb
 - lib/junos-ez/system.rb
 - lib/junos-ez/utils/config.rb
 - lib/junos-ez/utils/fs.rb
@@ -73,6 +76,7 @@ files:
 - examples/re_utils.rb
 - examples/simple.rb
 - examples/st_hosts.rb
+- examples/user.rb
 - examples/vlans.rb
 - docs/Config_Utils.md
 - docs/Facts.md
@@ -84,6 +88,7 @@ files:
 - docs/RE_utils.md
 - docs/StaticHosts.md
 - docs/StaticRoutes.md
+- docs/Users.md
 - docs/Vlans.md
 homepage: https://github.com/jeremyschulman/ruby-junos-ez-stdlib
 licenses: []