[GNUnet-SVN] [libeufin] branch master updated: Finish /keyletter logic.

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a commit to branch master
in repository libeufin.

The following commit(s) were added to refs/heads/master by this push:
     new bd89d19  Finish /keyletter logic.
bd89d19 is described below

commit bd89d19f158e15aabc03e712f5cd63c804a9c125
Author: Marcello Stanisci <address@hidden>
AuthorDate: Thu Oct 24 18:44:52 2019 +0200

    Finish /keyletter logic.
---
 sandbox/src/main/kotlin/Main.kt             | 109 ++++++++++++++++++++++++----
 sandbox/src/test/kotlin/InnerIniLoadTest.kt |   1 -
 2 files changed, 95 insertions(+), 15 deletions(-)

diff --git a/sandbox/src/main/kotlin/Main.kt b/sandbox/src/main/kotlin/Main.kt
index 0b0cc0e..92ec7cf 100644
--- a/sandbox/src/main/kotlin/Main.kt
+++ b/sandbox/src/main/kotlin/Main.kt
@@ -41,7 +41,6 @@ import org.jetbrains.exposed.sql.transactions.transaction
 import org.slf4j.LoggerFactory
 import org.w3c.dom.Document
 import org.w3c.dom.Element
-import tech.libeufin.messages.ebics.keyrequest.AuthenticationPubKeyInfoType
 import tech.libeufin.messages.ebics.keyrequest.EbicsUnsecuredRequest
 import tech.libeufin.messages.ebics.keyrequest.HIARequestOrderDataType
 import tech.libeufin.messages.ebics.keyrequest.SignaturePubKeyOrderDataType
@@ -53,7 +52,6 @@ import java.security.PublicKey
 import java.security.spec.RSAPublicKeySpec
 import java.util.zip.InflaterInputStream
 
-
 val logger = LoggerFactory.getLogger("tech.libeufin.sandbox")
 val xmlProcess = XML()
 val getEbicsHostId = {"LIBEUFIN-SANDBOX"}
@@ -260,16 +258,91 @@ private suspend fun 
ApplicationCall.adminCustomersKeyletter() {
         return
     }
 
-    /**********************************************/
+    val ebicsUserID = transaction {
+        EbicsUser.find { EbicsUsers.userId eq body.ini.userId }.firstOrNull()
+    }
+
+    if (ebicsUserID == null) {
+        respond(
+            HttpStatusCode.NotFound,
+            SandboxError("User ID not found")
+        )
+        return
+    }
+
+    val ebicsSubscriber = EbicsSubscriber.find {
+        EbicsSubscribers.userId eq EntityID(ebicsUserID.id.value, EbicsUsers)
+    }.firstOrNull()
+
+    if (ebicsSubscriber == null) {
+        respond(
+            HttpStatusCode.InternalServerError,
+            SandboxError("Bank had internal errors retrieving the Subscriber")
+        )
+        return
+    }
+
+    // check signature key
+    var modulusFromDd = BigInteger(ebicsSubscriber.signatureKey?.modulus)
+    var exponentFromDb = BigInteger(ebicsSubscriber.signatureKey?.exponent)
+    var modulusFromLetter = body.ini.public_modulus.toBigInteger(16)
+    var exponentFromLetter = body.ini.public_modulus.toBigInteger(16)
+
+    if (! ((modulusFromDd == modulusFromLetter) && (exponentFromDb == 
exponentFromLetter))) {
+        logger.info("Signature key mismatches for ${ebicsUserID.userId}")
+        respond(
+            HttpStatusCode.NotAcceptable,
+            SandboxError("Signature Key mismatches!")
+        )
+        return
+    }
+
+    logger.info("Signature key from user ${ebicsUserID.userId} becomes 
RELEASED")
+    ebicsSubscriber.signatureKey?.state = KeyStates.RELEASED
+
+    // check identification and authentication key
+    modulusFromDd = BigInteger(ebicsSubscriber.authenticationKey?.modulus)
+    exponentFromDb = BigInteger(ebicsSubscriber.authenticationKey?.exponent)
+    modulusFromLetter = body.hia.ia_public_modulus.toBigInteger(16)
+    exponentFromLetter = body.hia.ia_public_exponent.toBigInteger(16)
+
+    if (! ((modulusFromDd == modulusFromLetter) && (exponentFromDb == 
exponentFromLetter))) {
+        logger.info("Identification and authorization key mismatches for 
${ebicsUserID.userId}")
+        respond(
+            HttpStatusCode.NotAcceptable,
+            SandboxError("Identification and authorization key mismatches!")
+        )
+        return
+    }
+
+    logger.info("Authentication key from user ${ebicsUserID.userId} becomes 
RELEASED")
+    ebicsSubscriber.authenticationKey?.state = KeyStates.RELEASED
+
+    // check encryption key
+    modulusFromDd = BigInteger(ebicsSubscriber.encryptionKey?.modulus)
+    exponentFromDb = BigInteger(ebicsSubscriber.encryptionKey?.exponent)
+    modulusFromLetter = body.hia.enc_public_modulus.toBigInteger(16)
+    exponentFromLetter = body.hia.enc_public_exponent.toBigInteger(16)
+
+    if (! ((modulusFromDd == modulusFromLetter) && (exponentFromDb == 
exponentFromLetter))) {
+        logger.info("Encryption key mismatches for ${ebicsUserID.userId}")
+        respond(
+            HttpStatusCode.NotAcceptable,
+            SandboxError("Encryption key mismatches!")
+        )
+        return
+    }
+
+    logger.info("Encryption key from user ${ebicsUserID.userId} becomes 
RELEASED")
+    ebicsSubscriber.encryptionKey?.state = KeyStates.RELEASED
 
-    // Extract keys and compare them to what was
-    // received via the INI and HIA orders.
 
-    /**********************************************/
+    // TODO change subscriber status!
+    ebicsSubscriber.state = SubscriberStates.READY
 
     respond(
-        HttpStatusCode.NotImplemented,
-        SandboxError("Not properly implemented")
+        HttpStatusCode.OK,
+        "Your status has changed to READY"
     )
 }
 
@@ -344,10 +417,6 @@ private suspend fun ApplicationCall.ebicsweb() {
                 }.firstOrNull()
             }
 
-            /**
-             * Should _never_ happen, as upon a EBICS' user creation, a EBICS' 
subscriber
-             * row is also (via a helper function) added into the 
EbicsSubscribers table.
-             */
             if (ebicsSubscriber == null) {
 
                 val response = KeyManagementResponse(
@@ -461,7 +530,13 @@ private suspend fun ApplicationCall.ebicsweb() {
                             state = KeyStates.NEW
                         }
 
-                        ebicsSubscriber.state = 
SubscriberStates.PARTIALLY_INITIALIZED_INI
+                        if (ebicsSubscriber.state == SubscriberStates.NEW) {
+                            ebicsSubscriber.state = 
SubscriberStates.PARTIALLY_INITIALIZED_INI
+                        }
+
+                        if (ebicsSubscriber.state == 
SubscriberStates.PARTIALLY_INITIALIZED_HIA) {
+                            ebicsSubscriber.state = 
SubscriberStates.INITIALIZED
+                        }
                     }
 
                     logger.info("Signature key inserted in database _and_ 
subscriber state changed accordingly")
@@ -507,7 +582,13 @@ private suspend fun ApplicationCall.ebicsweb() {
                             state = KeyStates.NEW
                         }
 
-                        ebicsSubscriber.state = 
SubscriberStates.PARTIALLY_INITIALIZED_HIA
+                        if (ebicsSubscriber.state == SubscriberStates.NEW) {
+                            ebicsSubscriber.state = 
SubscriberStates.PARTIALLY_INITIALIZED_HIA
+                        }
+
+                        if (ebicsSubscriber.state == 
SubscriberStates.PARTIALLY_INITIALIZED_INI) {
+                            ebicsSubscriber.state = 
SubscriberStates.INITIALIZED
+                        }
                     }
                 }
             }
diff --git a/sandbox/src/test/kotlin/InnerIniLoadTest.kt 
b/sandbox/src/test/kotlin/InnerIniLoadTest.kt
index 4c51c50..7831893 100644
--- a/sandbox/src/test/kotlin/InnerIniLoadTest.kt
+++ b/sandbox/src/test/kotlin/InnerIniLoadTest.kt
@@ -2,7 +2,6 @@ package tech.libeufin.sandbox
 
 import org.junit.Test
 import tech.libeufin.messages.ebics.keyrequest.SignaturePubKeyOrderDataType
-import java.math.BigInteger
 
 class InnerIniLoadTest {
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden.