mirror of
https://github.com/corda/corda.git
synced 2025-01-04 04:04:27 +00:00
Moved netpermission packages to com.r3.corda
This commit is contained in:
parent
d54dbc414d
commit
dfa234fe94
@ -1,8 +1,8 @@
|
|||||||
package com.r3corda.netpermission
|
package com.r3.corda.netpermission
|
||||||
|
|
||||||
import com.google.common.net.HostAndPort
|
import com.google.common.net.HostAndPort
|
||||||
import com.r3corda.netpermission.internal.CertificateSigningService
|
import com.r3.corda.netpermission.internal.CertificateSigningService
|
||||||
import com.r3corda.netpermission.internal.persistence.DBCertificateRequestStorage
|
import com.r3.corda.netpermission.internal.persistence.DBCertificateRequestStorage
|
||||||
import joptsimple.ArgumentAcceptingOptionSpec
|
import joptsimple.ArgumentAcceptingOptionSpec
|
||||||
import joptsimple.OptionParser
|
import joptsimple.OptionParser
|
||||||
import net.corda.core.crypto.X509Utilities
|
import net.corda.core.crypto.X509Utilities
|
@ -1,7 +1,7 @@
|
|||||||
package com.r3corda.netpermission.internal
|
package com.r3.corda.netpermission.internal
|
||||||
|
|
||||||
import com.r3corda.netpermission.internal.persistence.CertificationData
|
import com.r3.corda.netpermission.internal.persistence.CertificationData
|
||||||
import com.r3corda.netpermission.internal.persistence.CertificationRequestStorage
|
import com.r3.corda.netpermission.internal.persistence.CertificationRequestStorage
|
||||||
import net.corda.core.crypto.X509Utilities.CACertAndKey
|
import net.corda.core.crypto.X509Utilities.CACertAndKey
|
||||||
import net.corda.core.crypto.X509Utilities.CORDA_CLIENT_CA
|
import net.corda.core.crypto.X509Utilities.CORDA_CLIENT_CA
|
||||||
import net.corda.core.crypto.X509Utilities.CORDA_INTERMEDIATE_CA
|
import net.corda.core.crypto.X509Utilities.CORDA_INTERMEDIATE_CA
|
@ -1,4 +1,4 @@
|
|||||||
package com.r3corda.netpermission.internal.persistence
|
package com.r3.corda.netpermission.internal.persistence
|
||||||
|
|
||||||
import org.bouncycastle.pkcs.PKCS10CertificationRequest
|
import org.bouncycastle.pkcs.PKCS10CertificationRequest
|
||||||
import java.security.cert.Certificate
|
import java.security.cert.Certificate
|
@ -1,4 +1,4 @@
|
|||||||
package com.r3corda.netpermission.internal.persistence
|
package com.r3.corda.netpermission.internal.persistence
|
||||||
|
|
||||||
import net.corda.core.crypto.SecureHash
|
import net.corda.core.crypto.SecureHash
|
||||||
import net.corda.node.utilities.*
|
import net.corda.node.utilities.*
|
||||||
@ -50,12 +50,12 @@ class DBCertificateRequestStorage(private val database: Database) : Certificatio
|
|||||||
override fun saveRequest(certificationData: CertificationData): String {
|
override fun saveRequest(certificationData: CertificationData): String {
|
||||||
return databaseTransaction(database) {
|
return databaseTransaction(database) {
|
||||||
withFinalizables { finalizables ->
|
withFinalizables { finalizables ->
|
||||||
val requestId = SecureHash.randomSHA256().toString()
|
val requestId = SecureHash.Companion.randomSHA256().toString()
|
||||||
DataTable.insert {
|
DataTable.insert {
|
||||||
it[DataTable.requestId] = requestId
|
it[DataTable.requestId] = requestId
|
||||||
it[hostName] = certificationData.hostName
|
it[hostName] = certificationData.hostName
|
||||||
it[ipAddress] = certificationData.ipAddr
|
it[ipAddress] = certificationData.ipAddr
|
||||||
it[DataTable.request] = serializeToBlob(certificationData.request, finalizables)
|
it[request] = serializeToBlob(certificationData.request, finalizables)
|
||||||
it[requestTimestamp] = LocalDateTime.now()
|
it[requestTimestamp] = LocalDateTime.now()
|
||||||
}
|
}
|
||||||
requestId
|
requestId
|
@ -1,4 +1,4 @@
|
|||||||
package com.r3corda.netpermission.internal.persistence
|
package com.r3.corda.netpermission.internal.persistence
|
||||||
|
|
||||||
import net.corda.core.crypto.SecureHash
|
import net.corda.core.crypto.SecureHash
|
||||||
import java.security.cert.Certificate
|
import java.security.cert.Certificate
|
@ -1,11 +1,11 @@
|
|||||||
package com.r3corda.netpermission
|
package com.r3.corda.netpermission
|
||||||
|
|
||||||
import com.google.common.net.HostAndPort
|
import com.google.common.net.HostAndPort
|
||||||
import com.nhaarman.mockito_kotlin.*
|
import com.nhaarman.mockito_kotlin.*
|
||||||
import com.r3corda.netpermission.CertificateSigningServer.Companion.hostAndPort
|
import com.r3.corda.netpermission.CertificateSigningServer.Companion.hostAndPort
|
||||||
import com.r3corda.netpermission.internal.CertificateSigningService
|
import com.r3.corda.netpermission.internal.CertificateSigningService
|
||||||
import com.r3corda.netpermission.internal.persistence.CertificationData
|
import com.r3.corda.netpermission.internal.persistence.CertificationData
|
||||||
import com.r3corda.netpermission.internal.persistence.CertificationRequestStorage
|
import com.r3.corda.netpermission.internal.persistence.CertificationRequestStorage
|
||||||
import net.corda.core.crypto.SecureHash
|
import net.corda.core.crypto.SecureHash
|
||||||
import net.corda.core.crypto.X509Utilities
|
import net.corda.core.crypto.X509Utilities
|
||||||
import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequest
|
import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequest
|
@ -1,4 +1,4 @@
|
|||||||
package com.r3corda.netpermission.internal.persistence
|
package com.r3.corda.netpermission.internal.persistence
|
||||||
|
|
||||||
import net.corda.core.crypto.X509Utilities
|
import net.corda.core.crypto.X509Utilities
|
||||||
import net.corda.node.utilities.configureDatabase
|
import net.corda.node.utilities.configureDatabase
|
Loading…
Reference in New Issue
Block a user