PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-12-24 11:57:59 +01:00
Code Issues Releases Wiki Activity

Merge pull request 'Implement authenticate command' (#2) from PGPainless/pgpainless:paul/heiko_wot into heiko/wot

Browse source 
Reviewed-on: https://codeberg.org/heiko/pgpainless/pulls/2
This commit is contained in:
heiko 2023-07-10 23:53:47 +00:00
commit fbdcae3c81
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pgpainless-wot-cli/src/main/kotlin/org/pgpainless/wot/cli/WotCLI.kt
View file

@ -13,6 +13,8 @@ import org.pgpainless.wot.api.WoTAPI
import org.pgpainless.wot.cli.subcommands.*
import org.pgpainless.wot.network.Fingerprint
import org.pgpainless.wot.network.ReferenceTime
import org.pgpainless.wot.network.Root
import org.pgpainless.wot.network.Roots
import pgp.cert_d.PGPCertificateStoreAdapter
import pgp.cert_d.subkey_lookup.InMemorySubkeyLookupFactory
import pgp.certificate_store.PGPCertificateStore
@ -39,7 +41,7 @@ import kotlin.system.exitProcess
)
class WotCLI: Callable<Int> {
@Option(names = ["--trust-root", "-r"], required = true)
@Option(names = ["--trust-root", "-r"])
var mTrustRoot: Array<String> = arrayOf()
@ArgGroup(exclusive = true, multiplicity = "1")
@ -62,10 +64,10 @@ class WotCLI: Callable<Int> {
@Option(names = ["--keyserver"], description=["Change the default keyserver"])
var keyServer: String = "hkps://keyserver.ubuntu.com"
*/
@Option(names = ["--gpg-ownertrust"])
var gpgOwnertrust: Boolean = false
*/
@Option(names = ["--certification-network"], description = ["Treat the web of trust as a certification network instead of an authentication network."])
var certificationNetwork = false
@ -73,8 +75,8 @@ class WotCLI: Callable<Int> {
@Option(names = ["--gossip"], description = ["Find arbitrary paths by treating all certificates as trust-roots with zero trust."])
var gossip = false
@ArgGroup(exclusive = true, multiplicity = "1")
lateinit var mTrustAmount: TrustAmount
@ArgGroup(exclusive = true)
var mTrustAmount: TrustAmount = TrustAmount()
class TrustAmount {
@Option(names = ["--trust-amount", "-a"], description = ["The required amount of trust."])
@ -104,13 +106,15 @@ class WotCLI: Callable<Int> {
} ?: ReferenceTime.now()
}
private val trustRoots: List<Fingerprint>
private val trustRoots: Roots
get() {
if (mCertificateSource.gpg) {
return readGpgOwnertrust().plus(mTrustRoot.map { Fingerprint(it) })
val trustRootFingerprints = if (mCertificateSource.gpg || gpgOwnertrust) {
readGpgOwnertrust().plus(mTrustRoot.map { Fingerprint(it) })
} else {
mTrustRoot.map { Fingerprint(it) }
}
return mTrustRoot.map { Fingerprint(it) }
return Roots(trustRootFingerprints.map { Root(it) })
}
private val amount: Int

10
wot-dijkstra/src/main/kotlin/org/pgpainless/wot/api/WoTAPI.kt
View file

@ -4,9 +4,11 @@
package org.pgpainless.wot.api
import org.pgpainless.wot.dijkstra.Query
import org.pgpainless.wot.network.Fingerprint
import org.pgpainless.wot.network.Network
import org.pgpainless.wot.network.ReferenceTime
import org.pgpainless.wot.network.Roots
/**
* Web of Trust API, offering different operations.
@ -21,7 +23,7 @@ import org.pgpainless.wot.network.ReferenceTime
*/
class WoTAPI(
val network: Network,
val trustRoots: List<Fingerprint>,
val trustRoots: Roots,
val gossip: Boolean = false,
val certificationNetwork: Boolean = false,
val trustAmount: Int = AuthenticationLevel.Fully.amount,
@ -32,7 +34,7 @@ class WoTAPI(
* Secondary constructor, taking an [AuthenticationLevel] instead of an [Int].
*/
constructor(network: Network,
trustRoots: List<Fingerprint>,
trustRoots: Roots,
gossip: Boolean = false,
certificationNetwork: Boolean = false,
trustAmount: AuthenticationLevel = AuthenticationLevel.Fully,
@ -40,7 +42,9 @@ class WoTAPI(
this(network,trustRoots, gossip,certificationNetwork, trustAmount.amount, referenceTime)
override fun authenticate(arguments: AuthenticateAPI.Arguments): AuthenticateAPI.Result {
TODO("Not yet implemented")
val query = Query(network, trustRoots, certificationNetwork)
val paths = query.authenticate(arguments.fingerprint, arguments.userId, trustAmount)
return AuthenticateAPI.Result(arguments.fingerprint, arguments.userId, trustAmount, paths)
}
override fun identify(arguments: IdentifyAPI.Arguments): IdentifyAPI.Result {