Add .json extension to log state filenames

Since they are JSON.
This commit is contained in:
Andrew Ayer 2017-01-08 10:14:37 -08:00
parent b88de6b320
commit 7adbc6cffe
1 changed files with 4 additions and 4 deletions

View File

@ -38,7 +38,7 @@ func sthFilename (sth *ct.SignedTreeHead) string {
panic(fmt.Sprintf("Unsupported STH version %d", sth.Version)) panic(fmt.Sprintf("Unsupported STH version %d", sth.Version))
} }
// For 6962-bis, we will need to handle a variable-length root hash, and include the signature in the filename hash (since signatures must be deterministic) // For 6962-bis, we will need to handle a variable-length root hash, and include the signature in the filename hash (since signatures must be deterministic)
return strconv.FormatUint(sth.TreeSize, 10) + "-" + base64.RawURLEncoding.EncodeToString(hasher.Sum(nil)) return strconv.FormatUint(sth.TreeSize, 10) + "-" + base64.RawURLEncoding.EncodeToString(hasher.Sum(nil)) + ".json"
} }
func makeLogStateDir (logStatePath string) error { func makeLogStateDir (logStatePath string) error {
@ -62,7 +62,7 @@ func OpenLogState (logStatePath string) (*LogState, error) {
} }
func (logState *LogState) VerifiedSTHFilename () string { func (logState *LogState) VerifiedSTHFilename () string {
return filepath.Join(logState.path, "verified_sth") return filepath.Join(logState.path, "verified_sth.json")
} }
func (logState *LogState) GetVerifiedSTH () (*ct.SignedTreeHead, error) { func (logState *LogState) GetVerifiedSTH () (*ct.SignedTreeHead, error) {
@ -130,7 +130,7 @@ func (logState *LogState) RemoveUnverifiedSTH (sth *ct.SignedTreeHead) error {
func (logState *LogState) GetTree () (*certspotter.CollapsedMerkleTree, error) { func (logState *LogState) GetTree () (*certspotter.CollapsedMerkleTree, error) {
tree := new(certspotter.CollapsedMerkleTree) tree := new(certspotter.CollapsedMerkleTree)
if err := readJSONFile(filepath.Join(logState.path, "tree"), tree); err != nil { if err := readJSONFile(filepath.Join(logState.path, "tree.json"), tree); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return nil, nil return nil, nil
} else { } else {
@ -141,5 +141,5 @@ func (logState *LogState) GetTree () (*certspotter.CollapsedMerkleTree, error) {
} }
func (logState *LogState) StoreTree (tree *certspotter.CollapsedMerkleTree) error { func (logState *LogState) StoreTree (tree *certspotter.CollapsedMerkleTree) error {
return writeJSONFile(filepath.Join(logState.path, "tree"), tree, 0666) return writeJSONFile(filepath.Join(logState.path, "tree.json"), tree, 0666)
} }