diff --git a/kanidm_tools/src/cli/common.rs b/kanidm_tools/src/cli/common.rs index 02e77ee7b..2f5ebc521 100644 --- a/kanidm_tools/src/cli/common.rs +++ b/kanidm_tools/src/cli/common.rs @@ -18,8 +18,8 @@ impl CommonOpt { 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 { @@ -29,15 +29,23 @@ impl CommonOpt { 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/kanidmd_web_ui/Cargo.toml b/kanidmd_web_ui/Cargo.toml index eddaaf8a6..a14dc6549 100644 --- a/kanidmd_web_ui/Cargo.toml +++ b/kanidmd_web_ui/Cargo.toml @@ -1,7 +1,10 @@ [package] name = "kanidmd_web_ui" version = "1.1.0-alpha.7" -authors = ["William Brown "] +authors = [ + "William Brown ", + "James Hodgkinson ", + ] rust-version = "1.59" edition = "2021" license = "MPL-2.0" diff --git a/kanidmd_web_ui/LICENSE.md b/kanidmd_web_ui/LICENSE.md new file mode 120000 index 000000000..7eabdb1c2 --- /dev/null +++ b/kanidmd_web_ui/LICENSE.md @@ -0,0 +1 @@ +../LICENSE.md \ No newline at end of file diff --git a/kanidmd_web_ui/README.md b/kanidmd_web_ui/README.md new file mode 120000 index 000000000..32d46ee88 --- /dev/null +++ b/kanidmd_web_ui/README.md @@ -0,0 +1 @@ +../README.md \ No newline at end of file diff --git a/kanidmd_web_ui/pkg/LICENSE.md b/kanidmd_web_ui/pkg/LICENSE.md new file mode 100644 index 000000000..52d135112 --- /dev/null +++ b/kanidmd_web_ui/pkg/LICENSE.md @@ -0,0 +1,374 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. + diff --git a/kanidmd_web_ui/pkg/README.md b/kanidmd_web_ui/pkg/README.md new file mode 100644 index 000000000..fdecb1c15 --- /dev/null +++ b/kanidmd_web_ui/pkg/README.md @@ -0,0 +1,101 @@ + +

+ +

+ +# Kanidm + +Kanidm is an identity management platform written in rust. Our goals are: + +* Modern identity management platform +* Simple to deploy and integrate with +* Extensible for various needs +* Correct and secure behaviour by default + +Today the project is still under heavy development to achieve these goals - We have many foundational +parts in place, and many of the required security features, but it is still an Alpha, and should be +treated as such. + +## Documentation / Getting Started / Install + +If you want to deploy Kanidm to see what it can do, you should read the [kanidm book] + +We also publish limited [support guidelines]. + +[kanidm book]: https://kanidm.github.io/kanidm/ +[support guidelines]: https://github.com/kanidm/kanidm/blob/master/project_docs/RELEASE_AND_SUPPORT.md + +## Code of Conduct / Ethics + +See our [code of conduct] + +See our documentation on [rights and ethics] + +[code of conduct]: https://github.com/kanidm/kanidm/blob/master/CODE_OF_CONDUCT.md +[rights and ethics]: https://github.com/kanidm/kanidm/blob/master/ethics/README.md + +## Getting in Contact / Questions + +We have a [gitter community channel] where we can talk. Firstyear is also happy to +answer questions via email, which can be found on their github profile. + +[gitter community channel]: https://gitter.im/kanidm/community + +## Developer Getting Started + +If you want to develop on the server, there is a getting started [guide for developers]. IDM +is a diverse topic and we encourage contributions of many kinds in the project, from people of +all backgrounds. + +[guide for developers]: https://github.com/kanidm/kanidm/blob/master/DEVELOPER_README.md + +## Features + +### Implemented + +* SSH key distribution for servers +* Pam/nsswitch clients (with limited offline auth) +* MFA - TOTP +* Highly concurrent design (MVCC, COW) +* RADIUS integration +* MFA - Webauthn + +### Currently Working On + +* CLI for administration +* WebUI for self-service with wifi enrollment, claim management and more. +* RBAC/Claims/Policy (limited by time and credential scope) + +### Upcoming Focus Areas + +* OIDC/Oauth +* Replication (async multiple active write servers, read-only servers) + +### Future + +* SSH CA management +* Sudo rule distribution via nsswitch +* WebUI for administration +* Account impersonation +* Synchronisation to other IDM services + +## Some key project ideas + +* All people should be respected and able to be represented securely. +* Devices represent users and their identities - they are part of the authentication. +* Human error occurs - we should be designed to minimise human mistakes and empower people. +* The system should be easy to understand and reason about for users and admins. + +### Features We Want to Avoid + +* Auditing: This is better solved by SIEM software, so we should generate data they can consume. +* Fully synchronous behaviour: This prevents scaling and our future ability to expand. +* Generic database: We don't want to be another NoSQL database, we want to be an IDM solution. +* Being like LDAP/GSSAPI/Kerberos: These are all legacy protocols that are hard to use and confine our thinking - we should avoid "being like them" or using them as models. + +## What does Kanidm mean? + +The original project name was rsidm while it was a thought experiment. Now that it's growing +and developing, we gave it a better project name. Kani is Japanese for "crab". Rust's mascot is a crab. +IDM is the common industry term for identity management services. + diff --git a/kanidmd_web_ui/pkg/kanidmd_web_ui.js b/kanidmd_web_ui/pkg/kanidmd_web_ui.js index c0477bd78..5a1baa5cf 100644 --- a/kanidmd_web_ui/pkg/kanidmd_web_ui.js +++ b/kanidmd_web_ui/pkg/kanidmd_web_ui.js @@ -220,7 +220,7 @@ function addBorrowedObject(obj) { } function __wbg_adapter_30(arg0, arg1, arg2) { try { - wasm._dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h3b4ba9e1909dbf65(arg0, arg1, addBorrowedObject(arg2)); + wasm._dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h044f18bcb347ffd0(arg0, arg1, addBorrowedObject(arg2)); } finally { heap[stack_pointer++] = undefined; } @@ -248,11 +248,11 @@ function makeClosure(arg0, arg1, dtor, f) { return real; } function __wbg_adapter_33(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h693f07e57b7269a6(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__ha821c5ee02284a59(arg0, arg1, addHeapObject(arg2)); } function __wbg_adapter_36(arg0, arg1, arg2) { - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h334d01558ab9ee3a(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hb14a7cff63e25e7d(arg0, arg1, addHeapObject(arg2)); } /** @@ -807,16 +807,16 @@ async function init(input) { var ret = wasm.memory; return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper1287 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 552, __wbg_adapter_30); + imports.wbg.__wbindgen_closure_wrapper1345 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 563, __wbg_adapter_30); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper1490 = function(arg0, arg1, arg2) { - var ret = makeClosure(arg0, arg1, 602, __wbg_adapter_33); + imports.wbg.__wbindgen_closure_wrapper1575 = function(arg0, arg1, arg2) { + var ret = makeClosure(arg0, arg1, 609, __wbg_adapter_33); return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper1632 = function(arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 640, __wbg_adapter_36); + imports.wbg.__wbindgen_closure_wrapper1700 = function(arg0, arg1, arg2) { + var ret = makeMutClosure(arg0, arg1, 648, __wbg_adapter_36); return addHeapObject(ret); }; diff --git a/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm b/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm index cb01e2dc4..f406e6d87 100644 Binary files a/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm and b/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm differ diff --git a/kanidmd_web_ui/pkg/package.json b/kanidmd_web_ui/pkg/package.json index b6895e1a4..9bdd36443 100644 --- a/kanidmd_web_ui/pkg/package.json +++ b/kanidmd_web_ui/pkg/package.json @@ -1,7 +1,8 @@ { "name": "kanidmd_web_ui", "collaborators": [ - "William Brown " + "William Brown ", + "James Hodgkinson " ], "description": "Kanidm Server Web User Interface", "version": "1.1.0-alpha.7", @@ -12,7 +13,8 @@ }, "files": [ "kanidmd_web_ui_bg.wasm", - "kanidmd_web_ui.js" + "kanidmd_web_ui.js", + "LICENSE.md" ], "module": "kanidmd_web_ui.js", "homepage": "https://github.com/kanidm/kanidm/", diff --git a/kanidmd_web_ui/src/views/apps.rs b/kanidmd_web_ui/src/views/apps.rs index e38458a6e..ec341c8f7 100644 --- a/kanidmd_web_ui/src/views/apps.rs +++ b/kanidmd_web_ui/src/views/apps.rs @@ -42,35 +42,38 @@ impl Component for AppsApp {

{ "Apps" }

-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
{ "#" }{ "Header" }{ "Header" }{ "Header" }{ "Header" }
{ "1,001" }{ "random" }{ "data" }{ "placeholder" }{ "text" }
{ "1,015" }{ "random" }{ "tabular" }{ "information" }{ "text" }
-
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
{ "#" }{ "Header" }{ "Header" }{ "Header" }{ "Header" }
{ "1,001" }{ "random" }{ "data" }{ "placeholder" }{ "text" }
{ "1,015" }{ "random" }{ "tabular" }{ "informaasdftion" }{ "text" }
+
} }