From 0010cce5e1786b5304c6be62614714238e2ac393 Mon Sep 17 00:00:00 2001 From: Firstyear Date: Sun, 17 Apr 2022 00:00:50 +0000 Subject: [PATCH] deploy: eb37e2f4ba130441c32d95c05bef83de6b8eff2b --- .../fn.prompt_for_username_get_token.html | 2 +- .../fn.prompt_for_username_get_username.html | 2 +- .../fn.prompt_for_username_get_values.html | 2 +- .../master/kanidm_cli/common/index.html | 2 +- .../master/kanidm_cli/struct.CommonOpt.html | 2 +- .../master/src/kanidm_cli/common.rs.html | 32 +++++++--- .../src/kanidmd_web_ui/views/apps.rs.html | 64 ++++++++++--------- 7 files changed, 64 insertions(+), 42 deletions(-) diff --git a/docs/rustdoc/master/kanidm_cli/common/fn.prompt_for_username_get_token.html b/docs/rustdoc/master/kanidm_cli/common/fn.prompt_for_username_get_token.html index 433df2b8b..ba4b95063 100644 --- a/docs/rustdoc/master/kanidm_cli/common/fn.prompt_for_username_get_token.html +++ b/docs/rustdoc/master/kanidm_cli/common/fn.prompt_for_username_get_token.html @@ -4,7 +4,7 @@
-

Function kanidm_cli::common::prompt_for_username_get_token

source · [−]
pub fn prompt_for_username_get_token() -> Result<String, String>
Expand description

This parses the token store and prompts the user to select their username, returns the token as a String

+

Function kanidm_cli::common::prompt_for_username_get_token

source · [−]
pub fn prompt_for_username_get_token() -> Result<String, String>
Expand description

This parses the token store and prompts the user to select their username, returns the token as a String

Powered by prompt_for_username_get_values

\ No newline at end of file diff --git a/docs/rustdoc/master/kanidm_cli/common/fn.prompt_for_username_get_username.html b/docs/rustdoc/master/kanidm_cli/common/fn.prompt_for_username_get_username.html index a603967d3..87afda37e 100644 --- a/docs/rustdoc/master/kanidm_cli/common/fn.prompt_for_username_get_username.html +++ b/docs/rustdoc/master/kanidm_cli/common/fn.prompt_for_username_get_username.html @@ -4,7 +4,7 @@
-

Function kanidm_cli::common::prompt_for_username_get_username

source · [−]
pub fn prompt_for_username_get_username() -> Result<String, String>
Expand description

This parses the token store and prompts the user to select their username, returns the username as a String

+

Function kanidm_cli::common::prompt_for_username_get_username

source · [−]
pub fn prompt_for_username_get_username() -> Result<String, String>
Expand description

This parses the token store and prompts the user to select their username, returns the username as a String

Powered by prompt_for_username_get_values

\ No newline at end of file diff --git a/docs/rustdoc/master/kanidm_cli/common/fn.prompt_for_username_get_values.html b/docs/rustdoc/master/kanidm_cli/common/fn.prompt_for_username_get_values.html index 12816510a..004790467 100644 --- a/docs/rustdoc/master/kanidm_cli/common/fn.prompt_for_username_get_values.html +++ b/docs/rustdoc/master/kanidm_cli/common/fn.prompt_for_username_get_values.html @@ -4,7 +4,7 @@
-

Function kanidm_cli::common::prompt_for_username_get_values

source · [−]
pub fn prompt_for_username_get_values() -> Result<(String, String), String>
Expand description

This parses the token store and prompts the user to select their username, returns the username/token as a tuple of Strings

+

Function kanidm_cli::common::prompt_for_username_get_values

source · [−]
pub fn prompt_for_username_get_values() -> Result<(String, String), String>
Expand description

This parses the token store and prompts the user to select their username, returns the username/token as a tuple of Strings

Used to reduce duplication in implementing prompt_for_username_get_username and prompt_for_username_get_token

\ No newline at end of file diff --git a/docs/rustdoc/master/kanidm_cli/common/index.html b/docs/rustdoc/master/kanidm_cli/common/index.html index c5043a721..c3cfb4939 100644 --- a/docs/rustdoc/master/kanidm_cli/common/index.html +++ b/docs/rustdoc/master/kanidm_cli/common/index.html @@ -4,7 +4,7 @@
-

Module kanidm_cli::common

source · [−]

Functions

+

Module kanidm_cli::common

source · [−]

Functions

prompt_for_username_get_token

This parses the token store and prompts the user to select their username, returns the token as a String

prompt_for_username_get_username

This parses the token store and prompts the user to select their username, returns the username as a String

prompt_for_username_get_values

This parses the token store and prompts the user to select their username, returns the username/token as a tuple of Strings

diff --git a/docs/rustdoc/master/kanidm_cli/struct.CommonOpt.html b/docs/rustdoc/master/kanidm_cli/struct.CommonOpt.html index 31be789cd..730e8f0b5 100644 --- a/docs/rustdoc/master/kanidm_cli/struct.CommonOpt.html +++ b/docs/rustdoc/master/kanidm_cli/struct.CommonOpt.html @@ -9,7 +9,7 @@ pub addr: Option<String>, pub username: Option<String>, pub ca_path: Option<PathBuf>, -}

Fields

debug: booladdr: Option<String>username: Option<String>ca_path: Option<PathBuf>

Implementations

Trait Implementations

Formats the value using the given formatter. Read more

+}

Fields

debug: booladdr: Option<String>username: Option<String>ca_path: Option<PathBuf>

Implementations

Trait Implementations

Formats the value using the given formatter. Read more

Returns clap::App corresponding to the struct.

Builds the struct from clap::ArgMatches. It’s guaranteed to succeed if matches originates from an App generated by [StructOpt::clap] called on diff --git a/docs/rustdoc/master/src/kanidm_cli/common.rs.html b/docs/rustdoc/master/src/kanidm_cli/common.rs.html index cee9d3a69..6209d5b96 100644 --- a/docs/rustdoc/master/src/kanidm_cli/common.rs.html +++ b/docs/rustdoc/master/src/kanidm_cli/common.rs.html @@ -204,6 +204,14 @@ 199 200 201 +202 +203 +204 +205 +206 +207 +208 +209 

use crate::session::read_tokens;
 use crate::CommonOpt;
 use compact_jwt::{Jws, JwsUnverified};
@@ -224,8 +232,8 @@
                 std::process::exit(1);
             });
         debug!(
-            "Successfully loaded configuration, looked in /etc/kanidm/config and {}",
-            &config_path
+            "Successfully loaded configuration, looked in /etc/kanidm/config and {} - client builder state: {:?}",
+            &config_path, &client_builder
         );
 
         let client_builder = match &self.addr {
@@ -235,15 +243,23 @@
 
         let ca_path: Option<&str> = self.ca_path.as_ref().map(|p| p.to_str()).flatten();
         let client_builder = match ca_path {
-            Some(p) => client_builder
-                .add_root_certificate_filepath(p)
-                .unwrap_or_else(|e| {
-                    error!("Failed to add ca certificate -- {:?}", e);
-                    std::process::exit(1);
-                }),
+            Some(p) => {
+                debug!("Adding trusted CA cert {:?}", p);
+                client_builder
+                    .add_root_certificate_filepath(p)
+                    .unwrap_or_else(|e| {
+                        error!("Failed to add ca certificate -- {:?}", e);
+                        std::process::exit(1);
+                    })
+            }
             None => client_builder,
         };
 
+        debug!(
+            "Post attempting to add trusted CA cert, client builder state: {:?}",
+            client_builder
+        );
+
         client_builder.build().unwrap_or_else(|e| {
             error!("Failed to build client instance -- {:?}", e);
             std::process::exit(1);
diff --git a/docs/rustdoc/master/src/kanidmd_web_ui/views/apps.rs.html b/docs/rustdoc/master/src/kanidmd_web_ui/views/apps.rs.html
index ac86aedce..7c7b38ba0 100644
--- a/docs/rustdoc/master/src/kanidmd_web_ui/views/apps.rs.html
+++ b/docs/rustdoc/master/src/kanidmd_web_ui/views/apps.rs.html
@@ -80,6 +80,9 @@
 75
 76
 77
+78
+79
+80
 
use gloo::console;
 use yew::prelude::*;
 
@@ -124,35 +127,38 @@
               <div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
                 <h2>{ "Apps" }</h2>
               </div>
-                <div class="table-responsive">
-                  <table class="table table-striped table-sm">
-                    <thead>
-                      <tr>
-                        <th scope="col">{ "#" }</th>
-                        <th scope="col">{ "Header" }</th>
-                        <th scope="col">{ "Header" }</th>
-                        <th scope="col">{ "Header" }</th>
-                        <th scope="col">{ "Header" }</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <tr>
-                        <td>{ "1,001" }</td>
-                        <td>{ "random" }</td>
-                        <td>{ "data" }</td>
-                        <td>{ "placeholder" }</td>
-                        <td>{ "text" }</td>
-                      </tr>
-                      <tr>
-                        <td>{ "1,015" }</td>
-                        <td>{ "random" }</td>
-                        <td>{ "tabular" }</td>
-                        <td>{ "information" }</td>
-                        <td>{ "text" }</td>
-                      </tr>
-                    </tbody>
-                  </table>
-                </div>
+              <div class="alert alert-warning" role="alert">
+                { "🦀 Kanidm is still in early Alpha, this interface is a placeholder! " }
+              </div>
+              <div class="table-responsive">
+                <table class="table table-striped table-sm">
+                  <thead>
+                    <tr>
+                      <th scope="col">{ "#" }</th>
+                      <th scope="col">{ "Header" }</th>
+                      <th scope="col">{ "Header" }</th>
+                      <th scope="col">{ "Header" }</th>
+                      <th scope="col">{ "Header" }</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <td>{ "1,001" }</td>
+                      <td>{ "random" }</td>
+                      <td>{ "data" }</td>
+                      <td>{ "placeholder" }</td>
+                      <td>{ "text" }</td>
+                    </tr>
+                    <tr>
+                      <td>{ "1,015" }</td>
+                      <td>{ "random" }</td>
+                      <td>{ "tabular" }</td>
+                      <td>{ "informaasdftion" }</td>
+                      <td>{ "text" }</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
             </>
         }
     }