Pulled in additions from lab guide

Author: deanthomasson

automation/Getting_Started.md

@@ -2,10 +2,23 @@
 
 The following steps walk you through how to get a pre-built fhe-toolkit docker image into a Hyper Protect Server container.
 
-### Preparing my system to handle a HPVS connection
+### Prerequisites
 
 * You can use any Linux or Unix based (Mac will work) computer that the ibm cloud supports
 
+* If the deploy script will be run on MacOS:
+     * Requires a `python` installation
+     * Install `gpg`
+          * MacOS with homebrew: `brew install gpg`
+               * To install homebrew: `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`
+          * MasOS without homebrew: download from https://gpgtools.org/
+
+     * Install `pyenv`
+          * MacOS with homebrew: `brew install pyenv`
+          * MacOS without homebrew: `curl https://pyenv.run | bash`
+* Otherwise, install these dependencies with your Linux distro's package manager
+
+### Creating an IBM Cloud account
 * Create an IBM Cloud account if you have never done so. To do this, go to [https://cloud.ibm.com/login](https://cloud.ibm.com/login) in your web browser. 
 
  If you don't have an account, select the "Create an account" link. [https://cloud.ibm.com/registration](https://cloud.ibm.com/registration)
@@ -22,7 +35,11 @@ The following steps walk you through how to get a pre-built fhe-toolkit docker i
      
 	 * Click Show.  Once you have that key, copy and save it somewhere that you won't forget or delete it.  Alternatively you can download it as a JSON file from the prompt on screen. 
 
-* Update or install `ibmcloud` CLI on local machine & on the S390 machine you will be using.  Its good to have  it working on another non-S390x machine because there are some things that you can't do 
+        * An example API key looks like this `k-y2lsNxfeKbaidcCG6kQVypLDR_WjmDPe-2Uuq_PTYx`
+
+
+
+* Update or install `ibmcloud` CLI on the machine you will be using. 
  		[https://cloud.ibm.com/docs/cli?topic=cli-getting-started](https://cloud.ibm.com/docs/cli?topic=cli-getting-started)
 
  		NOTE: If you have a mac, you can just open a terminal and issue the following command: 
@@ -86,11 +103,11 @@ Space:
 ```
 
 
-* Update to the latest container plugin (not sure this is available on S390)
+* Update to the latest container plugin
 
 	`ibmcloud plugin update container-registry`
 
-* Also install the hpvs plugin as well (this is definitely NOT on S390)
+* Install the hpvs plugin as well
 
 	`ibmcloud plugin install hpvs`
 
@@ -100,22 +117,57 @@ Space:
 
     Login to cloud.ibm.com -> `Manage -> Account -> Account Resources -> Resource Groups -> Create`
 
-* If the deploy script will be run on MacOS:
-     * Requires a `python` installation
-     * Install `gpg`
-          * MacOS with homebrew: `brew install gpg`
-               * To install homebrew: `/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"`
-          * MasOS without homebrew: download from https://gpgtools.org/
+#### The Keys
+To sign and deploy an image to HPVS, we need three to four sets of keys:
+1. Root key; root of content trust for an image tag
+2. Repository key (aka "target key"); allows you to sign image tags and manage delegations (including delegated keys or permitted delegation paths)
+3. Encryption key for the HPVS registration definition file
+4. Vendor key, required for signing the HPVS registration definition file
+5. Delegation key (optional); allows you to delegate signing image tags to other publishers without having to share your repository key
+ 
+Before you can run `DeployToHPVS.sh`, you must tell it:
+1. The passphrase to use for the root key
+2. The passphrase to use for the repository key
+3. The name and location of the GPG vendor key (both public and private)
+4. The name and location of the delegation key (optional)
 
-     * Install `pyenv`
-          * MacOS with homebrew: `brew install pyenv`
-          * MacOS without homebrew: `curl https://pyenv.run | bash`
+##### Automatic key generation
+If `DeployToHPVS.sh` called with the `-c` option, the interactive wizard will walk you through the process of key generation.
 
- * Login onto the S390x machine (see greg for credentials if you dont have them)
+The root and repository keys are generated automatically by `docker trust`, which is invoked by `DeployToHPVS.sh`.  The HPVS registration encryption key is hardcoded into `DeployToHPVS.sh`.  The other keys (the vendor and delegation keys) must be generated ahead of time.
 
- * Clone the fhe-toolkit repo `https://github.com/IBM/fhe-toolkit-linux.git`
+##### Vendor key
+
+To generate a vendor keypair, create a GPG batch file with the following contents:
+```
+%echo Generating registration definition key
+Key-Type: RSA
+Key-Length: 4096
+Subkey-Type: RSA
+Subkey-Length: 4096
+Name-Real: fhe_user
+Expire-Date: 0
+Passphrase: <passphrase>
+%echo done
+```
+Then run the following to generate a new keypair as the `fhe_user` identity:
+```
+gpg -a --batch --generate-key <batchfile>
+```
+
+##### Delegation keys
+Delegations in Docker Content Trust (DCT) allow you to control who can and cannot sign an image tag. A delegation will have a pair of private and public delegation keys. A delegation could contain multiple pairs of keys and contributors in order to allow multiple users to be part of a delegation, and to support key rotation.
+
+If `delegationkey` is `false` or commented-out in your configuration file, then the repository key will be used to sign your image. Thereafter, any changes to your image can only be made using the repository key.
+
+Delegation keys can be generated using `docker trust`:
+```
+docker trust key generate <yourkeyname>
+```
 
- * Checkout the hpvs_work_integration branch `git checkout hpvs_work_integration`
+
+### Running the HPVS Deploy script
+ * Clone the fhe-toolkit repo `https://github.com/IBM/fhe-toolkit-linux.git`
 
  * cd into the main folder `cd fhe-toolkit-linux` and build a local image `./BuildDockerImage ubuntu` If you want to test with fedora change `ubuntu` to `fedora` in the command
 
@@ -132,6 +184,26 @@ Space:
       
 Everything should run from here.  Please note where the script gets stuck and errors out (if it does)
 
+### Accessing the toolkit
+ When the deploy script has run successfully...
+ 
+ * Log on to the Dashboard section of https://cloud.ibm.com. 
+ 
+ * Expand services in the resource list, click on the image and then click on "View Full Details" to access the public IP address, and copy it to your browser adding the port 8443. It will look like: https://xxx.xx.xx.xx:8443/
+
+ * Acknowledge that the server is using a self-signed certificate, accept risk and continue 
+
+### Running the toolkit
+ * Once the toolkit is loaded, you should automatically be prompted to select a kit for the FHE-Workspace to use. Select one of the kits from the dropdown. Configuration of the workspace will begin which you will be able to see in the Output Window. You'll also notice the kit you selected is now shown in the CMake Tools status bar at the bottom of the window.
+
+ * If you are not automatically prompted to select a kit after a few seconds of loading the toolkit, try refreshing your browser. If you're still not prompted, check the CMake Tools status bar at the bottom of the window to see if a kit has already been selected. You'll need to select a kit each time you start a new instance of the Toolkit.
+
+ * Click “Build” in the CMake Tools status bar to build the selected target.
+
+ * When the build has finished, click “Launch” in CMake Tools status bar to launch the selected target in the terminal window.
+
+ Each demonstration application is in a self-contained directory in the examples folder in the IDE. Each demo application directory contains a README.md that explains how to run the demo and what you should expect for results. For instance, the BGV World Country Database Lookup Example Documentation contains the information to run a complete example of a privacy preserving search against an encrypted database. The database is a key value store prepopulated with the english names of countries and their capital cities from the world. Selecting the country will perform a search of the matching capital.
+
 
 
 ### Debug Mode