Merge branch 'feature/pdf-signer' of https://bitbucket.org/digitorus/pdfsign into feature/pdf-signer
This commit is contained in:
Jeroen Bobbeldijk
3
.gitignore
vendored
Normal file
3
.gitignore
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
pdfsign
|
||||||
|
certs/
|
||||||
|
.realize/
|
||||||
34
config/config.go
Normal file
34
config/config.go
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
package config
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"bitbucket.org/digitorus/pdfsign/sign"
|
||||||
|
"github.com/BurntSushi/toml"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
DefaultLocation string = "./pdfsign.conf" // Default location of the config file
|
||||||
|
Settings Config // Initialized once inside Read method Settings are stored in memory.
|
||||||
|
)
|
||||||
|
|
||||||
|
// Config is the root of the config
|
||||||
|
type Config struct {
|
||||||
|
Info sign.SignDataSignatureInfo
|
||||||
|
TSA sign.TSA
|
||||||
|
}
|
||||||
|
|
||||||
|
func Read(configfile string) {
|
||||||
|
|
||||||
|
_, err := os.Stat(configfile)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal("Config file is missing: ", configfile)
|
||||||
|
}
|
||||||
|
|
||||||
|
var c Config
|
||||||
|
if _, err := toml.DecodeFile(configfile, &c); err != nil {
|
||||||
|
}
|
||||||
|
|
||||||
|
Settings = c
|
||||||
|
}
|
||||||
24
config/config_test.go
Normal file
24
config/config_test.go
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
package config_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"bitbucket.org/digitorus/littlewatcher/src/config"
|
||||||
|
"github.com/BurntSushi/toml"
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestConfig(t *testing.T) {
|
||||||
|
const configContent = `
|
||||||
|
staticPath = "../static"
|
||||||
|
`
|
||||||
|
|
||||||
|
var c config.Config
|
||||||
|
|
||||||
|
if _, err := toml.Decode(configContent, &c); err != nil {
|
||||||
|
t.Error(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Root
|
||||||
|
assert.Equal(t, "../static", c)
|
||||||
|
}
|
||||||
284
sign.go
284
sign.go
@@ -4,141 +4,179 @@ import (
|
|||||||
"flag"
|
"flag"
|
||||||
"log"
|
"log"
|
||||||
"os"
|
"os"
|
||||||
"time"
|
|
||||||
|
|
||||||
"crypto/x509"
|
"fmt"
|
||||||
"encoding/pem"
|
|
||||||
"errors"
|
|
||||||
"io/ioutil"
|
|
||||||
|
|
||||||
"bitbucket.org/digitorus/pdfsign/revocation"
|
"bitbucket.org/digitorus/pdfsign/config"
|
||||||
"bitbucket.org/digitorus/pdfsign/sign"
|
"bitbucket.org/digitorus/pdfsign/sign"
|
||||||
"bitbucket.org/digitorus/pdfsign/verify"
|
"bitbucket.org/digitorus/pdfsign/verify"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// usage is a usage function for the flags package.
|
||||||
func usage() {
|
func usage() {
|
||||||
log.Fatal("Usage: sign input.pdf output.pdf certificate.crt private_key.key [chain.crt] OR verify input.pdf")
|
fmt.Fprintf(os.Stderr, "Pdfsign is a tool to sign and verify PDF digital signatures\n\n")
|
||||||
|
fmt.Fprintf(os.Stderr, "Usage:\n\n")
|
||||||
|
fmt.Fprintf(os.Stderr, "\tpdfsign command [arguments]\n\n")
|
||||||
|
fmt.Fprintf(os.Stderr, "The commands are:\n\n")
|
||||||
|
fmt.Fprintf(os.Stderr, "\tsign \t\tsign single PDF document\n")
|
||||||
|
fmt.Fprintf(os.Stderr, "\tverify \t\tverify signature of single PDF document\n")
|
||||||
|
fmt.Fprintf(os.Stderr, "\tserve \t\tserve web API with signing capabilities. API documentation url\n")
|
||||||
|
fmt.Fprintf(os.Stderr, "\twatch \t\tautomatically sign PDF files inside a folder\n")
|
||||||
|
fmt.Fprintf(os.Stderr, "\n\n")
|
||||||
|
flag.PrintDefaults()
|
||||||
|
os.Exit(2)
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
flag.Parse()
|
// if no flags provided print usage
|
||||||
|
if len(os.Args) == 1 {
|
||||||
if len(flag.Args()) < 2 {
|
|
||||||
usage()
|
usage()
|
||||||
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
method := flag.Arg(0)
|
switch os.Args[1] {
|
||||||
if method != "sign" && method != "verify" {
|
case "sign":
|
||||||
usage()
|
simpleSign()
|
||||||
}
|
case "verify":
|
||||||
|
verifyPDF()
|
||||||
input := flag.Arg(1)
|
case "serve":
|
||||||
if len(input) == 0 {
|
case "watch":
|
||||||
usage()
|
default:
|
||||||
}
|
fmt.Printf("%q is not valid command.\n", os.Args[1])
|
||||||
|
os.Exit(2)
|
||||||
if method == "verify" {
|
}
|
||||||
input_file, err := os.Open(input)
|
}
|
||||||
if err != nil {
|
|
||||||
log.Fatal(err)
|
func verifyPDF() {
|
||||||
}
|
verifyCommand := flag.NewFlagSet("verify", flag.ExitOnError)
|
||||||
defer input_file.Close()
|
input := verifyCommand.String("in", "", "")
|
||||||
|
|
||||||
resp, err := verify.Verify(input_file)
|
input_file, err := os.Open(*input)
|
||||||
log.Println(resp)
|
if err != nil {
|
||||||
if err != nil {
|
log.Fatal(err)
|
||||||
log.Println(err)
|
}
|
||||||
}
|
defer input_file.Close()
|
||||||
}
|
|
||||||
|
resp, err := verify.Verify(input_file)
|
||||||
if method == "sign" {
|
log.Println(resp)
|
||||||
if len(flag.Args()) < 5 {
|
if err != nil {
|
||||||
usage()
|
log.Println(err)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
output := flag.Arg(2)
|
|
||||||
if len(output) == 0 {
|
func getSignDataFlags(f *flag.FlagSet) sign.SignData {
|
||||||
usage()
|
// Signature info
|
||||||
}
|
name := f.String("info-name", config.Settings.Info.Name, "Signature info name")
|
||||||
|
location := f.String("info-location", config.Settings.Info.Location, "Signature info location")
|
||||||
certificate_data, err := ioutil.ReadFile(flag.Arg(3))
|
reason := f.String("info-reason", config.Settings.Info.Reason, "Signature info reason")
|
||||||
if err != nil {
|
contact := f.String("info-contact", config.Settings.Info.ContactInfo, "Signature info contact")
|
||||||
log.Fatal(err)
|
// Signature other
|
||||||
|
approval := f.Bool("approval", false, "Approval")
|
||||||
}
|
certType := f.Uint("type", 0, "Certificate type")
|
||||||
certificate_data_block, _ := pem.Decode(certificate_data)
|
|
||||||
if certificate_data_block == nil {
|
// TSA
|
||||||
log.Fatal(errors.New("failed to parse PEM block containing the certificate"))
|
tsaUrl := f.String("tsa-url", "", "tsaUrl")
|
||||||
}
|
tsaUsername := f.String("tsa-username", "", "tsaUsername")
|
||||||
|
tsaPassword := f.String("tsa-password", "", "tsaPassword")
|
||||||
cert, err := x509.ParseCertificate(certificate_data_block.Bytes)
|
|
||||||
if err != nil {
|
var sd sign.SignData
|
||||||
log.Fatal(err)
|
sd.Signature.Info.Name = *name
|
||||||
}
|
sd.Signature.Info.Location = *location
|
||||||
|
sd.Signature.Info.Reason = *reason
|
||||||
key_data, err := ioutil.ReadFile(flag.Arg(4))
|
sd.Signature.Info.ContactInfo = *contact
|
||||||
if err != nil {
|
sd.Signature.CertType = uint32(*certType)
|
||||||
log.Fatal(err)
|
sd.Signature.Approval = *approval
|
||||||
}
|
sd.TSA.URL = *tsaUrl
|
||||||
key_data_block, _ := pem.Decode(key_data)
|
sd.TSA.Username = *tsaUsername
|
||||||
if key_data_block == nil {
|
sd.TSA.Password = *tsaPassword
|
||||||
log.Fatal(errors.New("failed to parse PEM block containing the private key"))
|
return sd
|
||||||
}
|
}
|
||||||
|
|
||||||
pkey, err := x509.ParsePKCS1PrivateKey(key_data_block.Bytes)
|
func simpleSign() {
|
||||||
if err != nil {
|
signCommand := flag.NewFlagSet("sign", flag.ExitOnError)
|
||||||
log.Fatal(err)
|
configPath := signCommand.String("config", "", "Path to config file")
|
||||||
}
|
signCommand.Parse(os.Args[2:])
|
||||||
|
if *configPath != "" {
|
||||||
certificate_chains := make([][]*x509.Certificate, 0)
|
config.Read(*configPath)
|
||||||
|
}
|
||||||
if flag.Arg(5) != "" {
|
|
||||||
certificate_pool := x509.NewCertPool()
|
inputPath := signCommand.String("in", "", "Input PDF file")
|
||||||
if err != nil {
|
outputPath := signCommand.String("out", "", "Output PDF file")
|
||||||
log.Fatal(err)
|
crtPath := signCommand.String("crt", "", "Certificate")
|
||||||
}
|
keyPath := signCommand.String("key", "", "Private key")
|
||||||
|
crtChainPath := signCommand.String("chain", "", "Certificate chain")
|
||||||
chain_data, err := ioutil.ReadFile(flag.Arg(5))
|
help := signCommand.Bool("help", false, "Show this help")
|
||||||
if err != nil {
|
signData := getSignDataFlags(signCommand)
|
||||||
log.Fatal(err)
|
signCommand.Parse(os.Args[2:])
|
||||||
}
|
|
||||||
|
usageText := `usage: pdfsign sign -in input.pdf -out output.pdf -crt certificate.crt -key private_key.key [-chain chain.crt]")
|
||||||
certificate_pool.AppendCertsFromPEM(chain_data)
|
Description
|
||||||
certificate_chains, err = cert.Verify(x509.VerifyOptions{
|
`
|
||||||
Intermediates: certificate_pool,
|
if *help == true {
|
||||||
CurrentTime: cert.NotBefore,
|
fmt.Println(usageText)
|
||||||
KeyUsages: []x509.ExtKeyUsage{x509.ExtKeyUsageAny},
|
signCommand.PrintDefaults()
|
||||||
})
|
return
|
||||||
if err != nil {
|
}
|
||||||
log.Fatal(err)
|
|
||||||
}
|
if signCommand.Parsed() == false || *inputPath == "" || *outputPath == "" || *crtPath == "" || *keyPath == "" {
|
||||||
}
|
fmt.Println(usageText)
|
||||||
|
signCommand.PrintDefaults()
|
||||||
err = sign.SignFile(input, output, sign.SignData{
|
os.Exit(2)
|
||||||
Signature: sign.SignDataSignature{
|
}
|
||||||
Info: sign.SignDataSignatureInfo{
|
|
||||||
Name: "Jeroen Bobbeldijk",
|
s, err := newSigner(*crtPath, *keyPath, *crtChainPath)
|
||||||
Location: "Rotterdam",
|
if err != nil {
|
||||||
Reason: "Test",
|
log.Fatal(err)
|
||||||
ContactInfo: "Geen",
|
}
|
||||||
Date: time.Now().Local(),
|
|
||||||
},
|
if err := s.sign(*inputPath, *outputPath, signData); err != nil {
|
||||||
CertType: 2,
|
log.Println(err)
|
||||||
Approval: false,
|
} else {
|
||||||
},
|
log.Println("Signed PDF written to " + *outputPath)
|
||||||
Signer: pkey,
|
}
|
||||||
Certificate: cert,
|
}
|
||||||
CertificateChains: certificate_chains,
|
|
||||||
TSA: sign.TSA{
|
func p11sign() {
|
||||||
URL: "http://aatl-timestamp.globalsign.com/tsa/aohfewat2389535fnasgnlg5m23",
|
signCommand := flag.NewFlagSet("sign", flag.ExitOnError)
|
||||||
},
|
configPath := signCommand.String("config", "", "Path to config file")
|
||||||
RevocationData: revocation.InfoArchival{},
|
signCommand.Parse(os.Args[2:])
|
||||||
RevocationFunction: sign.DefaultEmbedRevocationStatusFunction,
|
if *configPath != "" {
|
||||||
})
|
config.Read(*configPath)
|
||||||
if err != nil {
|
}
|
||||||
log.Println(err)
|
|
||||||
} else {
|
input := signCommand.String("in", "", "Input PDF file")
|
||||||
log.Println("Signed PDF written to " + output)
|
output := signCommand.String("out", "", "Output PDF file")
|
||||||
}
|
libPath := signCommand.String("lib", "", "Path to PKCS11 library")
|
||||||
|
pass := signCommand.String("pass", "", "PKCS11 password")
|
||||||
|
crtChainPath := signCommand.String("chain", "", "Certificate chain")
|
||||||
|
help := signCommand.Bool("help", false, "Show this help")
|
||||||
|
signData := getSignDataFlags(signCommand)
|
||||||
|
signCommand.Parse(os.Args[2:])
|
||||||
|
usageText := `Usage: pdfsign sign -in input.pdf -out output.pdf -pass pkcs11-password [-chain chain.crt]")
|
||||||
|
|
||||||
|
Description
|
||||||
|
|
||||||
|
`
|
||||||
|
if *help == true {
|
||||||
|
fmt.Println(usageText)
|
||||||
|
signCommand.PrintDefaults()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if signCommand.Parsed() == false || *input == "" || *output == "" || *pass == "" {
|
||||||
|
fmt.Println(usageText)
|
||||||
|
signCommand.PrintDefaults()
|
||||||
|
os.Exit(2)
|
||||||
|
}
|
||||||
|
|
||||||
|
s, err := newP11Signer(*libPath, *pass, *crtChainPath)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := s.sign(*input, *output, signData); err != nil {
|
||||||
|
log.Println(err)
|
||||||
|
} else {
|
||||||
|
log.Println("Signed PDF written to " + *output)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
154
signer.go
Normal file
154
signer.go
Normal file
@@ -0,0 +1,154 @@
|
|||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"crypto"
|
||||||
|
"crypto/x509"
|
||||||
|
"encoding/pem"
|
||||||
|
"errors"
|
||||||
|
"io/ioutil"
|
||||||
|
"log"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"bitbucket.org/digitorus/pdfsign/revocation"
|
||||||
|
"bitbucket.org/digitorus/pdfsign/sign"
|
||||||
|
"bitbucket.org/digitorus/pkcs11"
|
||||||
|
)
|
||||||
|
|
||||||
|
type signer struct {
|
||||||
|
certificate *x509.Certificate
|
||||||
|
signer crypto.Signer
|
||||||
|
certificateChains [][]*x509.Certificate
|
||||||
|
}
|
||||||
|
|
||||||
|
func newSigner(crtPath, keyPath, crtChainPath string) (*signer, error) {
|
||||||
|
var s signer
|
||||||
|
|
||||||
|
// Set certificate
|
||||||
|
certificate_data, err := ioutil.ReadFile(crtPath)
|
||||||
|
if err != nil {
|
||||||
|
return &s, err
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
certificate_data_block, _ := pem.Decode(certificate_data)
|
||||||
|
if certificate_data_block == nil {
|
||||||
|
return &s, errors.New("failed to parse PEM block containing the certificate")
|
||||||
|
}
|
||||||
|
cert, err := x509.ParseCertificate(certificate_data_block.Bytes)
|
||||||
|
if err != nil {
|
||||||
|
return &s, err
|
||||||
|
}
|
||||||
|
s.certificate = cert
|
||||||
|
|
||||||
|
// Set key
|
||||||
|
key_data, err := ioutil.ReadFile(keyPath)
|
||||||
|
if err != nil {
|
||||||
|
return &s, err
|
||||||
|
}
|
||||||
|
key_data_block, _ := pem.Decode(key_data)
|
||||||
|
if key_data_block == nil {
|
||||||
|
return &s, errors.New("failed to parse PEM block containing the private key")
|
||||||
|
}
|
||||||
|
pkey, err := x509.ParsePKCS1PrivateKey(key_data_block.Bytes)
|
||||||
|
if err != nil {
|
||||||
|
return &s, err
|
||||||
|
}
|
||||||
|
s.signer = pkey
|
||||||
|
|
||||||
|
certificate_chains, err := getCertificateChains(crtChainPath, cert)
|
||||||
|
if err != nil {
|
||||||
|
return &s, err
|
||||||
|
}
|
||||||
|
s.certificateChains = certificate_chains
|
||||||
|
|
||||||
|
return &s, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func newP11Signer(libPath, pass, crtChainPath string) (*signer, error) {
|
||||||
|
var s signer
|
||||||
|
|
||||||
|
// pkcs11 key
|
||||||
|
lib, err := pkcs11.FindLib(libPath)
|
||||||
|
if err != nil {
|
||||||
|
return &s, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load Library
|
||||||
|
ctx := pkcs11.New(lib)
|
||||||
|
if ctx == nil {
|
||||||
|
return &s, errors.New("Failed to load library")
|
||||||
|
}
|
||||||
|
err = ctx.Initialize()
|
||||||
|
if err != nil {
|
||||||
|
return &s, err
|
||||||
|
}
|
||||||
|
// login
|
||||||
|
session, err := pkcs11.CreateSession(ctx, 0, pass, false)
|
||||||
|
if err != nil {
|
||||||
|
return &s, err
|
||||||
|
}
|
||||||
|
// select the first certificate
|
||||||
|
cert, ckaId, err := pkcs11.GetCert(ctx, session, nil)
|
||||||
|
if err != nil {
|
||||||
|
return &s, err
|
||||||
|
}
|
||||||
|
s.certificate = cert
|
||||||
|
|
||||||
|
// private key
|
||||||
|
pkey, err := pkcs11.InitPrivateKey(ctx, session, ckaId)
|
||||||
|
if err != nil {
|
||||||
|
return &s, err
|
||||||
|
}
|
||||||
|
s.signer = pkey
|
||||||
|
|
||||||
|
certificate_chains, err := getCertificateChains(crtChainPath, cert)
|
||||||
|
if err != nil {
|
||||||
|
return &s, err
|
||||||
|
}
|
||||||
|
s.certificateChains = certificate_chains
|
||||||
|
|
||||||
|
return &s, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func getCertificateChains(crtChainPath string, cert *x509.Certificate) ([][]*x509.Certificate, error) {
|
||||||
|
certificate_chains := make([][]*x509.Certificate, 0)
|
||||||
|
if crtChainPath == "" {
|
||||||
|
return certificate_chains, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
chain_data, err := ioutil.ReadFile(crtChainPath)
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal(err)
|
||||||
|
}
|
||||||
|
certificate_pool := x509.NewCertPool()
|
||||||
|
certificate_pool.AppendCertsFromPEM(chain_data)
|
||||||
|
certificate_chains, err = cert.Verify(x509.VerifyOptions{
|
||||||
|
Intermediates: certificate_pool,
|
||||||
|
CurrentTime: cert.NotBefore,
|
||||||
|
KeyUsages: []x509.ExtKeyUsage{x509.ExtKeyUsageAny},
|
||||||
|
})
|
||||||
|
|
||||||
|
return certificate_chains, err
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *signer) sign(input, output string, d sign.SignData) error {
|
||||||
|
err := sign.SignFile(input, output, sign.SignData{
|
||||||
|
Signature: sign.SignDataSignature{
|
||||||
|
Info: sign.SignDataSignatureInfo{
|
||||||
|
Name: d.Signature.Info.Name,
|
||||||
|
Location: d.Signature.Info.Location,
|
||||||
|
Reason: d.Signature.Info.Reason,
|
||||||
|
ContactInfo: d.Signature.Info.ContactInfo,
|
||||||
|
Date: time.Now().Local(),
|
||||||
|
},
|
||||||
|
CertType: d.Signature.CertType,
|
||||||
|
Approval: d.Signature.Approval,
|
||||||
|
},
|
||||||
|
Signer: s.signer,
|
||||||
|
Certificate: s.certificate,
|
||||||
|
CertificateChains: s.certificateChains,
|
||||||
|
TSA: d.TSA,
|
||||||
|
RevocationData: revocation.InfoArchival{},
|
||||||
|
RevocationFunction: sign.DefaultEmbedRevocationStatusFunction,
|
||||||
|
})
|
||||||
|
return err
|
||||||
|
}
|
||||||
@@ -12,11 +12,11 @@ import (
|
|||||||
|
|
||||||
"bitbucket.org/digitorus/pdf"
|
"bitbucket.org/digitorus/pdf"
|
||||||
"bitbucket.org/digitorus/pdfsign/revocation"
|
"bitbucket.org/digitorus/pdfsign/revocation"
|
||||||
|
"crypto"
|
||||||
"github.com/digitorus/pkcs7"
|
"github.com/digitorus/pkcs7"
|
||||||
"github.com/digitorus/timestamp"
|
"github.com/digitorus/timestamp"
|
||||||
"log"
|
|
||||||
"golang.org/x/crypto/ocsp"
|
"golang.org/x/crypto/ocsp"
|
||||||
"crypto"
|
"log"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Response struct {
|
type Response struct {
|
||||||
|
|||||||
Reference in New Issue
Block a user