dan
/
onionscan
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

extract PGP identity and fingerprint (as supplied by x/crypto/openpgp)

This commit is contained in:
Dan Ballard 2016-05-27 08:03:42 -07:00 committed by Sarah Jamie Lewis
parent 56c267c66e
commit b87ec44b3c
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
report/onionscanreport.go
View File

@ -16,6 +16,12 @@ type ExifImage struct {
ExifTags []ExifTag `json:"exifTags"` ExifTags []ExifTag `json:"exifTags"`
} }
type PGPKey struct {
ArmoredKey string `json:"armoredKey"`
Identity string `json:"identity"`
FingerPrint string `json:"fingerprint"`
}
type OnionScanReport struct { type OnionScanReport struct {
HiddenService string `json:"hiddenService"` HiddenService string `json:"hiddenService"`
@ -43,7 +49,7 @@ type OnionScanReport struct {
ExifImages []ExifImage `json:"exifImages"` ExifImages []ExifImage `json:"exifImages"`
InterestingFiles []string `json:"interestingFiles"` InterestingFiles []string `json:"interestingFiles"`
PageReferencedDirectories []string `json:"pageReferencedDirectories"` PageReferencedDirectories []string `json:"pageReferencedDirectories"`
PGPKeys []string `json:"pgpKeys"` PGPKeys []PGPKey `json:"pgpKeys"`
Hashes []string `json:"hashes"` Hashes []string `json:"hashes"`
Snapshot string `json:"snapshot"` Snapshot string `json:"snapshot"`
PageTitle string `json:"pageTitle"` PageTitle string `json:"pageTitle"`
@ -105,9 +111,9 @@ func (osr *OnionScanReport) AddInternalPage(site string) {
utils.RemoveDuplicates(&osr.InternalPages) utils.RemoveDuplicates(&osr.InternalPages)
} }
func (osr *OnionScanReport) AddPGPKey(key string) { func (osr *OnionScanReport) AddPGPKey(armoredKey, identity, fingerprint string) {
osr.PGPKeys = append(osr.PGPKeys, key) osr.PGPKeys = append(osr.PGPKeys, PGPKey{armoredKey, identity, fingerprint})
utils.RemoveDuplicates(&osr.PGPKeys) //TODO map of fingerprint:PGPKeys? and utils.RemoveDuplicates(&osr.PGPKeys)
} }
func (osr *OnionScanReport) AddResponseHeader(name string, value string) { func (osr *OnionScanReport) AddResponseHeader(name string, value string) {

27
scans/pgp_content_scan.go
View File

@ -1,19 +1,40 @@
package scans package scans
import ( import (
"fmt"
"github.com/s-rah/onionscan/report" "github.com/s-rah/onionscan/report"
"golang.org/x/crypto/openpgp"
"log" "log"
"regexp" "regexp"
"strings"
) )
type PGPContentScan struct { type PGPContentScan struct {
} }
func (cs *PGPContentScan) ScanContent(content string, report *report.OnionScanReport) { func (cs *PGPContentScan) ScanContent(content string, report *report.OnionScanReport) {
log.Printf("\tScanning for PGP Key\n") log.Printf("Scanning for PGP Key\n")
pgpRegexp := regexp.MustCompile("-----BEGIN PGP PUBLIC KEY BLOCK-----((?s).*)-----END PGP PUBLIC KEY BLOCK-----") pgpRegexp := regexp.MustCompile("-----BEGIN PGP PUBLIC KEY BLOCK-----((?s).*)-----END PGP PUBLIC KEY BLOCK-----")
foundPGP := pgpRegexp.FindAllString(content, -1) foundPGP := pgpRegexp.FindAllString(content, -1)
for _, key := range foundPGP { for _, keyString := range foundPGP {
report.AddPGPKey(key) keys, err := openpgp.ReadArmoredKeyRing(strings.NewReader(keyString))
if err != nil {
log.Printf("ERROR: %s\n", err)
continue
}
if len(keys) < 1 || len(keys[0].Subkeys) < 1 || len(keys[0].Identities) < 1 {
log.Printf("ERROR: failed to accept key\n")
continue
}
var identity string
for identity = range keys[0].Identities {
break
}
var fingerprint string
fingerprint = fmt.Sprintf("%X", keys[0].Subkeys[0].PublicKey.Fingerprint)
log.Printf("\tFound PGP Key fingerprint: %s belonging to %s", fingerprint, identity)
report.AddPGPKey(keyString, identity, fingerprint)
} }
} }