idk/muwire
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hook up CertClient, check that infohash in cert matches

Browse Source
This commit is contained in:
Zlatin Balevsky
2019-11-04 18:33:57 +00:00
parent 642044b7e2
commit dba863a864
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/groovy/com/muwire/core/Core.groovy
View File

@@ -18,8 +18,10 @@ import com.muwire.core.download.UIDownloadCancelledEvent
import com.muwire.core.download.UIDownloadEvent
import com.muwire.core.download.UIDownloadPausedEvent
import com.muwire.core.download.UIDownloadResumedEvent
import com.muwire.core.filecert.CertificateClient
import com.muwire.core.filecert.CertificateManager
import com.muwire.core.filecert.UICreateCertificateEvent
import com.muwire.core.filecert.UIFetchCertificatesEvent
import com.muwire.core.files.FileDownloadedEvent
import com.muwire.core.files.FileHashedEvent
import com.muwire.core.files.FileHashingEvent
@@ -216,6 +218,7 @@ public class Core {
certificateManager = new CertificateManager(eventBus, home, me, spk)
eventBus.register(UICreateCertificateEvent.class, certificateManager)
log.info("initializing trust service")
File goodTrust = new File(home, "trusted")
File badTrust = new File(home, "distrusted")
@@ -269,6 +272,10 @@ public class Core {
log.info("initializing connector")
I2PConnector i2pConnector = new I2PConnector(socketManager)
log.info("initializing certificate client")
CertificateClient certificateClient = new CertificateClient(eventBus, i2pConnector)
eventBus.register(UIFetchCertificatesEvent.class, certificateClient)
log.info "initializing results sender"
ResultsSender resultsSender = new ResultsSender(eventBus, i2pConnector, me, props, certificateManager)

3
core/src/main/groovy/com/muwire/core/filecert/CertificateClient.groovy
View File

@@ -75,7 +75,8 @@ class CertificateClient {
} catch (IOException | InvalidSignatureException ignore) {
continue
}
eventBus.publish(new CertificateFetchedEvent(certificate : cert))
if (cert.infoHash == e.infoHash)
eventBus.publish(new CertificateFetchedEvent(certificate : cert))
}
} catch (Exception bad) {
log.log(Level.WARNING,"Fetching certificates failed", bad)