CA-407687/XSI-1834: get_subject_information_from_identifier should

query xapi db, then fallback to query domain DC

get_subject_information_from_identifier query subject details from
subject id. It triggers some DNS query to do kerberos query.

The subject details are actually cached in xapi db and refreshed
default in every 10 minutes. get_subject_information_from_identifier
should query subject details from xapi DB and only fallback to DC
when xapi DB does not have it.

Signed-off-by: Lin Liu <[email protected]>

Author: liulinC

ocaml/xapi/extauth.ml

@@ -193,3 +193,19 @@ let call_extauth_hook_script_in_pool ~__context event_name =
       event_name ;
     []
   )
+
+let call_with_exception_handler fn =
+  try fn () with
+  | Extauth_is_disabled ->
+      raise (Api_errors.Server_error (Api_errors.auth_is_disabled, []))
+  | Unknown_extauth_type msg ->
+      raise (Api_errors.Server_error (Api_errors.auth_unknown_type, [msg]))
+  | Not_found | Auth_signature.Subject_cannot_be_resolved ->
+      raise (Api_errors.Server_error (Api_errors.subject_cannot_be_resolved, []))
+  | Auth_signature.Auth_service_error (_, msg) ->
+      raise (Api_errors.Server_error (Api_errors.auth_service_error, [msg]))
+  | e ->
+      raise
+        (Api_errors.Server_error
+           (Api_errors.auth_service_error, [ExnHelper.string_of_exn e])
+        )

ocaml/xapi/xapi_auth.ml

@@ -18,22 +18,6 @@
 open Auth_signature
 open Extauth
 
-let call_with_exception_handler fn =
-  try fn () with
-  | Extauth.Extauth_is_disabled ->
-      raise (Api_errors.Server_error (Api_errors.auth_is_disabled, []))
-  | Extauth.Unknown_extauth_type msg ->
-      raise (Api_errors.Server_error (Api_errors.auth_unknown_type, [msg]))
-  | Not_found | Auth_signature.Subject_cannot_be_resolved ->
-      raise (Api_errors.Server_error (Api_errors.subject_cannot_be_resolved, []))
-  | Auth_signature.Auth_service_error (_, msg) ->
-      raise (Api_errors.Server_error (Api_errors.auth_service_error, [msg]))
-  | e ->
-      raise
-        (Api_errors.Server_error
-           (Api_errors.auth_service_error, [ExnHelper.string_of_exn e])
-        )
-
 (* PRECONDITION: All of these additional calls require a valid session to be presented.*)
 (* ==> the session validity is already checked in every server.ml call by using Session_check.check *)
 
@@ -49,5 +33,12 @@ let get_group_membership ~__context ~subject_identifier =
 
 let get_subject_information_from_identifier ~__context ~subject_identifier =
   call_with_exception_handler (fun () ->
-      (Ext_auth.d ()).query_subject_information ~__context subject_identifier
+      try
+        (* Query from xapi db first *)
+        Xapi_subject.query_subject_information_from_db ~__context
+          subject_identifier
+      with Auth_signature.Subject_cannot_be_resolved ->
+        (* Not found, fall back to query AD *)
+        Xapi_subject.query_subject_information_from_AD ~__context
+          subject_identifier
   )

ocaml/xapi/xapi_pool.ml

@@ -2661,9 +2661,8 @@ let revalidate_subjects ~__context =
     let subj_id = Db.Subject.get_subject_identifier ~__context ~self in
     debug "Revalidating subject %s" subj_id ;
     try
-      let open Auth_signature in
-      ignore
-        ((Extauth.Ext_auth.d ()).query_subject_information ~__context subj_id)
+      Xapi_subject.query_subject_information_from_AD ~__context subj_id
+      |> ignore
     with Not_found ->
       debug "Destroying subject %s" subj_id ;
       Xapi_subject.destroy ~__context ~self

ocaml/xapi/xapi_subject.ml

@@ -39,6 +39,27 @@ let asynchronously_run_hook_script_after_subject_add =
   At_least_once_more.make "running after-subject-add hook script"
     run_hook_script_after_subject_add
 
+let query_subject_information_from_db ~__context identifier =
+  let open Xapi_database.Db_filter_types in
+  match
+    Db.Subject.get_records_where ~__context
+      ~expr:(Eq (Field "subject_identifier", Literal identifier))
+  with
+  | [] ->
+      raise Auth_signature.Subject_cannot_be_resolved
+  | x :: _ ->
+      let subject_r = snd x in
+      subject_r.API.subject_other_config
+
+let query_subject_information_from_AD ~__context identifier =
+  (Extauth.Ext_auth.d ()).query_subject_information ~__context identifier
+
+let get_subject_information_from_identifier ~__context ~cache identifier =
+  if cache then
+    query_subject_information_from_db ~__context identifier
+  else
+    query_subject_information_from_AD ~__context identifier
+
 let create ~__context ~subject_identifier ~other_config:_ =
   (* If at least one of the hosts uses AD external auth, then assert that the AD feature is enabled *)
   let hosts = Db.Host.get_all ~__context in
@@ -87,8 +108,8 @@ let create ~__context ~subject_identifier ~other_config:_ =
     in
     (* subject_info is overrided by subject info queried form DC *)
     let subject_info =
-      Xapi_auth.get_subject_information_from_identifier ~__context
-        ~subject_identifier
+      Extauth.call_with_exception_handler @@ fun () ->
+      query_subject_information_from_AD ~__context subject_identifier
     in
     Db.Subject.create ~__context ~ref ~uuid ~subject_identifier
       ~other_config:subject_info ~roles:default_roles ;
@@ -130,8 +151,8 @@ let update ~__context ~self =
   (* query external directory service *)
   (* this might raise an exception *)
   let subject_info =
-    Xapi_auth.get_subject_information_from_identifier ~__context
-      ~subject_identifier
+    Extauth.call_with_exception_handler @@ fun () ->
+    query_subject_information_from_AD ~__context subject_identifier
   in
   if Db.Subject.get_other_config ~__context ~self <> subject_info then (
     (* update locally the fresh information received from external directory service *)
@@ -243,22 +264,3 @@ let remove_from_roles ~__context ~self ~role =
       (Ref.string_of role) ;
     raise (Api_errors.Server_error (Api_errors.role_not_found, []))
   )
-
-let query_subject_information_from_db ~__context identifier =
-  let open Xapi_database.Db_filter_types in
-  match
-    Db.Subject.get_records_where ~__context
-      ~expr:(Eq (Field "subject_identifier", Literal identifier))
-  with
-  | [] ->
-      raise Auth_signature.Subject_cannot_be_resolved
-  | x :: _ ->
-      let subject_r = snd x in
-      subject_r.API.subject_other_config
-
-let get_subject_information_from_identifier ~__context ~cache identifier =
-  let open Extauth in
-  if cache then
-    query_subject_information_from_db ~__context identifier
-  else
-    (Ext_auth.d ()).query_subject_information ~__context identifier