Misc fixes (#631)

* add edge-api module description
* allow to load IdentityConfig from stream
* fix API error extraction
* cleanup

Author: ekoby

edge-api/build.gradle

@@ -47,6 +47,7 @@ publishing {
 }
 
 ext {
+    description "OpenZiti Edge API client"
     jackson_version = libs.versions.jackson.get()
     jakarta_annotation_version = libs.versions.jakarta.annotation.get()
 }

ziti/src/main/kotlin/org/openziti/api/Controller.kt

@@ -16,6 +16,7 @@
 
 package org.openziti.api
 
+import com.fasterxml.jackson.module.kotlin.treeToValue
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.asExecutor
@@ -30,7 +31,6 @@ import org.openziti.edge.ApiClient
 import org.openziti.edge.ApiException
 import org.openziti.edge.api.*
 import org.openziti.edge.model.*
-import org.openziti.edge.model.Meta
 import org.openziti.getZitiError
 import org.openziti.impl.ZitiImpl
 import org.openziti.util.Logged
@@ -43,10 +43,9 @@ import java.net.http.HttpClient
 import java.util.concurrent.CompletableFuture
 import java.util.function.Consumer
 import javax.net.ssl.SSLContext
-import javax.net.ssl.X509TrustManager
 import kotlin.reflect.full.memberFunctions
 
-internal class Controller(endpoint: URL, sslContext: SSLContext, trustManager: X509TrustManager) :
+internal class Controller(endpoint: URL, sslContext: SSLContext):
     Logged by ZitiLog() {
 
     private val pageSize = 100
@@ -274,8 +273,12 @@ internal class Controller(endpoint: URL, sslContext: SSLContext, trustManager: X
     }
 
     private fun getError(resp: String): String {
-        val apiError = edgeApi.objectMapper.convertValue(resp, ApiError::class.java)
-        return apiError.code ?: apiError.message!!
+
+        val err = edgeApi.objectMapper.treeToValue<ApiErrorEnvelope>(
+            edgeApi.objectMapper.readTree(resp)
+        ).error
+
+        return err.code ?: err.message!!
     }
 
     private fun getClientInfo(): Authenticate = Authenticate().apply {

ziti/src/main/kotlin/org/openziti/identity/util.kt

@@ -103,12 +103,14 @@ internal fun loadKeystore(f: File, pwd: CharArray): KeyStore {
 
 internal fun loadKeystore(stream: InputStream, pwd: CharArray): KeyStore {
     val log = ZitiLog()
-    val ks = loadKeystore(stream, pwd, log)
+    val bytes = stream.readNBytes(16 * 1024)
+    val ks = loadKeystore(bytes.inputStream(), pwd, log)
     if (ks != null) {
         return ks
     }
 
-    throw IllegalArgumentException("unsupported format")
+    val id = IdentityConfig.load(bytes.inputStream().reader())
+    return keystoreFromConfig(id)
 }
 
 internal fun loadKeystore(stream: InputStream, pwd: CharArray, log: ZitiLog): KeyStore? {

ziti/src/main/kotlin/org/openziti/impl/ZitiContextImpl.kt

@@ -77,7 +77,7 @@ internal class ZitiContextImpl(internal val id: Identity, enabled: Boolean) : Zi
     private val currentEdgeRouters =
         MutableStateFlow<Collection<CurrentIdentityEdgeRouterDetail>>(emptyList())
 
-    private val controller: Controller = Controller(URI.create(id.controller()).toURL(), sslContext(), trustManager())
+    private val controller: Controller = Controller(URI.create(id.controller()).toURL(), sslContext())
     private val postureService = PostureService()
 
     private val statusCh: MutableStateFlow<ZitiContext.Status>

ziti/src/test/kotlin/org/openziti/api/ControllerTest.kt

@@ -58,7 +58,7 @@ internal class ControllerTest {
 
         identity = KeyStoreIdentity(ks, findIdentityAlias(ks))
 
-        ctrl = Controller(URL(identity.controller()), identity.sslContext(), identity.trustManager())
+        ctrl = Controller(URL(identity.controller()), identity.sslContext())
     }
 
     @After

ziti/src/test/kotlin/org/openziti/identity/EnrollTest.kt

@@ -133,7 +133,7 @@ class EnrollTest {
         assertNotNull("Name", identity.name())
 
         val controller =
-            Controller(URI.create(identity.controller()).toURL(), identity.sslContext(), identity.trustManager())
+            Controller(URI.create(identity.controller()).toURL(), identity.sslContext())
         val loginResp = controller.login()
         assertNotNull("login with device cert", loginResp.token)
         controller.logout()

ziti/src/test/kotlin/org/openziti/identity/ZitiTestHelper.kt

@@ -58,7 +58,7 @@ internal object ZitiTestHelper {
         val url = props.getProperty("controller") ?: fail("need controller")
 
         ctrlURI = URI.create(url)
-        controller = Controller(ctrlURI.toURL(), controllerSSL, TrustAll)
+        controller = Controller(ctrlURI.toURL(), controllerSSL)
 
         val s = controller!!.login(Login(username, password))
         session = s.token