vikarti.anatra/safing-jess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix and improve recent additions

Browse source
This commit is contained in:
Daniel 2022-08-12 13:15:58 +02:00
parent 663e8fcfc7
commit 3e3a8c29b4
5 changed files with 14 additions and 9 deletions

8
cmd/cmd-verify.go
View file

@ -83,7 +83,7 @@ var verifyCmd = &cobra.Command{
}
// Only verify if .sig or .letter.
if strings.HasSuffix(path, sigFileExtension) ||
if strings.HasSuffix(path, filesig.Extension) ||
strings.HasSuffix(path, letterFileExtension) {
if err := verify(path, true); err != nil {
verificationFails++
@ -135,11 +135,11 @@ func verify(filename string, bulkMode bool) error {
signedBy, err = verifyLetter(filename, bulkMode)
case strings.HasSuffix(filename, letterFileExtension):
signedBy, err = verifyLetter(filename, bulkMode)
case strings.HasSuffix(filename, sigFileExtension):
filename = strings.TrimSuffix(filename, sigFileExtension)
case strings.HasSuffix(filename, filesig.Extension):
filename = strings.TrimSuffix(filename, filesig.Extension)
fallthrough
default:
signame = filename + sigFileExtension
signame = filename + filesig.Extension
signedBy, err = verifySig(filename, signame, bulkMode)
}

2
cmd/main.go
View file

@ -53,7 +53,7 @@ func main() {
rootCmd.PersistentFlags().StringVarP(&trustStoreDir, "tsdir", "d", "",
"specify a truststore directory (default loaded from JESS_TS_DIR env variable)",
)
rootCmd.PersistentFlags().StringVarP(&trustStoreDir, "tskeyring", "k", "",
rootCmd.PersistentFlags().StringVarP(&trustStoreKeyring, "tskeyring", "r", "",
"specify a truststore keyring namespace (default loaded from JESS_TS_KEYRING env variable) - lower priority than tsdir",
)
rootCmd.PersistentFlags().StringVarP(&noSpec, "no", "n", "",

4
envelope.go
View file

@ -285,14 +285,14 @@ func (e *Envelope) CleanSignets() {
}
}
for i, signet := range e.Senders {
e.Secrets[i] = &Signet{
e.Senders[i] = &Signet{
Version: signet.Version,
ID: signet.ID,
Scheme: signet.Scheme,
}
}
for i, signet := range e.Recipients {
e.Secrets[i] = &Signet{
e.Recipients[i] = &Signet{
Version: signet.Version,
ID: signet.ID,
Scheme: signet.Scheme,

3
filesig/main.go
View file

@ -9,6 +9,9 @@ import (
"github.com/safing/portbase/formats/dsd"
)
// Extension holds the default file extension to be used for signature files.
const Extension = ".sig"
var fileSigRequirements = jess.NewRequirements().
Remove(jess.RecipientAuthentication).
Remove(jess.Confidentiality)

6
import_export.go
View file

@ -182,11 +182,13 @@ func EnvelopeFromTextFormat(textFormat string) (*Envelope, error) {
return EnvelopeFromBase58(splitted[len(splitted)-1])
}
var replaceForTextFormatMatcher = regexp.MustCompile(`[^A-Za-z\-]+`)
var replaceForTextFormatMatcher = regexp.MustCompile(`[^A-Za-z0-9]+`)
// toTextFormatString makes a string compatible with the text format.
func toTextFormatString(s string) string {
return strings.ToLower(
replaceForTextFormatMatcher.ReplaceAllString(s, "_"),
strings.Trim(
replaceForTextFormatMatcher.ReplaceAllString(s, "-"), "-",
),
)
}