Adding an admin privilege to node registration, which makes API use possible.

Author: adamhjk

chef-server/lib/controllers/openid_consumer.rb

@@ -62,7 +62,10 @@ def complete
       when OpenID::Consumer::SUCCESS
         session[:openid] = oidresp.identity_url
         if oidresp.display_identifier =~ /openid\/server\/node\/(.+)$/
-          session[:level] = :node
+          reg_name = $1
+          reg = Chef::OpenIDRegistration.load(reg_name)
+          Chef::Log.error("#{reg_name} is an admin #{reg.admin}")
+          session[:level] = reg.admin ? :admin : :node
           session[:node_name] = $1
         else
           session[:level] = :admin

chef-server/lib/controllers/openid_register.rb

@@ -96,4 +96,15 @@ def validate
     r.save
     redirect url(:registrations)
   end
+  
+  def admin
+    begin
+      r = Chef::OpenIDRegistration.load(params[:id])
+    rescue Exception => e
+      raise BadRequest, "Cannot find the registration for #{params[:id]}"
+    end
+    r.admin = r.admin ? false : true
+    r.save
+    redirect url(:registrations)
+  end
 end

chef-server/lib/init.rb

@@ -192,6 +192,8 @@
 
   resources :registrations, :controller => "openid_register" 
   resources :registrations, :controller => "openid_register", :member => { :validate => :post }
+  resources :registrations, :controller => "openid_register", :member => { :admin => :post }
+  
   match("/openid/server").to(:controller => "openid_server", :action => "index").name(:openid_server)
   match("/openid/server/server/xrds").
     to(:controller => "openid_server", :action => 'idp_xrds').name(:openid_server_xrds)

chef-server/lib/views/openid_register/index.html.haml

@@ -10,6 +10,9 @@
         %form{ :method => "post", :action => url(:validate_registration, { :id => node.name })}
           - submit_name =  node.validated ? "Invalidate" : "Validate"
           %input{ :type => "submit", :name => submit_name, :value => submit_name }
+        %form{ :method => "post", :action => url(:admin_registration, { :id => node.name })}
+          - submit_name =  node.admin ? "Remove Admin Rights" : "Admin"
+          %input{ :type => "submit", :name => submit_name, :value => submit_name }
         %form{ :method => "post", :action => url(:registration, { :id => node.name })}
           %input{ :type => "hidden", :name => "_method", :value => "delete" }
           %input{ :type => "submit", :name => "Delete", :value => "Delete" }

chef-server/lib/views/openid_register/show.html.haml

@@ -3,3 +3,4 @@
   %li
     %a{ :href => url(:openid_node , { :id => @registered_node.name.gsub(/\./, "_") }) } OpenID URL
   %li= "Validated: #{@registered_node.validated}"
+  %li= "Admin: #{@registered_node.admin}"

chef/lib/chef/openid_registration.rb

@@ -26,7 +26,7 @@
 class Chef
   class OpenIDRegistration
 
-    attr_accessor :name, :salt, :validated, :password, :couchdb_rev
+    attr_accessor :name, :salt, :validated, :password, :couchdb_rev, :admin
 
     include Chef::Mixin::ParamsValidate
 
@@ -83,6 +83,7 @@ def initialize()
       @salt = nil
       @password = nil
       @validated = false
+      @admin = false
       @couchdb_rev = nil
       @couchdb = Chef::CouchDB.new
     end
@@ -107,6 +108,7 @@ def to_json(*a)
         'salt' => @salt,
         'password' => @password,
         'validated' => @validated,
+        'admin' => @admin,
         'chef_type' => 'openid_registration',
       }
       result["_rev"] = @couchdb_rev if @couchdb_rev
@@ -120,6 +122,7 @@ def self.json_create(o)
       me.salt = o["salt"]
       me.password = o["password"]
       me.validated = o["validated"]
+      me.admin = o["admin"]
       me.couchdb_rev = o["_rev"] if o.has_key?("_rev")
       me
     end