2022-11-02 00:58:41 +00:00
|
|
|
## Nim-Codex
|
|
|
|
## Copyright (c) 2022 Status Research & Development GmbH
|
|
|
|
## Licensed under either of
|
|
|
|
## * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
|
|
|
|
## * MIT license ([LICENSE-MIT](LICENSE-MIT))
|
|
|
|
## at your option.
|
|
|
|
## This file may not be copied, modified, or distributed except according to
|
|
|
|
## those terms.
|
|
|
|
|
|
|
|
import pkg/upraises
|
|
|
|
push: {.upraises: [].}
|
|
|
|
|
|
|
|
import pkg/questionable/results
|
2023-08-01 23:47:57 +00:00
|
|
|
import pkg/libp2p/crypto/crypto
|
2022-11-02 00:58:41 +00:00
|
|
|
|
|
|
|
import ./fileutils
|
|
|
|
import ../errors
|
feat: create logging proxy (#663)
* implement a logging proxy
The logging proxy:
- prevents the need to import chronicles (as well as export except toJson),
- prevents the need to override `writeValue` or use or import nim-json-seralization elsewhere in the codebase, allowing for sole use of utils/json for de/serialization,
- and handles json formatting correctly in chronicles json sinks
* Rename logging -> logutils to avoid ambiguity with common names
* clean up
* add setProperty for JsonRecord, remove nim-json-serialization conflict
* Allow specifying textlines and json format separately
Not specifying a LogFormat will apply the formatting to both textlines and json sinks.
Specifying a LogFormat will apply the formatting to only that sink.
* remove unneeded usages of std/json
We only need to import utils/json instead of std/json
* move serialization from rest/json to utils/json so it can be shared
* fix NoColors ambiguity
Was causing unit tests to fail on Windows.
* Remove nre usage to fix Windows error
Windows was erroring with `could not load: pcre64.dll`. Instead of fixing that error, remove the pcre usage :)
* Add logutils module doc
* Shorten logutils.formatIt for `NBytes`
Both json and textlines formatIt were not needed, and could be combined into one formatIt
* remove debug integration test config
debug output and logformat of json for integration test logs
* Use ## module doc to support docgen
* bump nim-poseidon2 to export fromBytes
Before the changes in this branch, fromBytes was likely being resolved by nim-stew, or other dependency. With the changes in this branch, that dependency was removed and fromBytes could no longer be resolved. By exporting fromBytes from nim-poseidon, the correct resolution is now happening.
* fixes to get compiling after rebasing master
* Add support for Result types being logged using formatIt
2024-01-23 07:35:03 +00:00
|
|
|
import ../logutils
|
2022-11-02 00:58:41 +00:00
|
|
|
import ../rng
|
|
|
|
|
2023-08-01 23:47:57 +00:00
|
|
|
export crypto
|
|
|
|
|
2022-11-02 00:58:41 +00:00
|
|
|
type
|
|
|
|
CodexKeyError = object of CodexError
|
|
|
|
CodexKeyUnsafeError = object of CodexKeyError
|
|
|
|
|
|
|
|
proc setupKey*(path: string): ?!PrivateKey =
|
|
|
|
if not path.fileAccessible({AccessFlags.Find}):
|
|
|
|
info "Creating a private key and saving it"
|
|
|
|
let
|
|
|
|
res = ? PrivateKey.random(Rng.instance()[]).mapFailure(CodexKeyError)
|
|
|
|
bytes = ? res.getBytes().mapFailure(CodexKeyError)
|
|
|
|
|
2022-11-07 14:54:24 +00:00
|
|
|
? path.secureWriteFile(bytes).mapFailure(CodexKeyError)
|
2022-11-02 00:58:41 +00:00
|
|
|
return PrivateKey.init(bytes).mapFailure(CodexKeyError)
|
|
|
|
|
|
|
|
info "Found a network private key"
|
2022-11-07 14:54:24 +00:00
|
|
|
if not ? checkSecureFile(path).mapFailure(CodexKeyError):
|
2022-11-02 00:58:41 +00:00
|
|
|
warn "The network private key file is not safe, aborting"
|
|
|
|
return failure newException(
|
|
|
|
CodexKeyUnsafeError, "The network private key file is not safe")
|
feat: create logging proxy (#663)
* implement a logging proxy
The logging proxy:
- prevents the need to import chronicles (as well as export except toJson),
- prevents the need to override `writeValue` or use or import nim-json-seralization elsewhere in the codebase, allowing for sole use of utils/json for de/serialization,
- and handles json formatting correctly in chronicles json sinks
* Rename logging -> logutils to avoid ambiguity with common names
* clean up
* add setProperty for JsonRecord, remove nim-json-serialization conflict
* Allow specifying textlines and json format separately
Not specifying a LogFormat will apply the formatting to both textlines and json sinks.
Specifying a LogFormat will apply the formatting to only that sink.
* remove unneeded usages of std/json
We only need to import utils/json instead of std/json
* move serialization from rest/json to utils/json so it can be shared
* fix NoColors ambiguity
Was causing unit tests to fail on Windows.
* Remove nre usage to fix Windows error
Windows was erroring with `could not load: pcre64.dll`. Instead of fixing that error, remove the pcre usage :)
* Add logutils module doc
* Shorten logutils.formatIt for `NBytes`
Both json and textlines formatIt were not needed, and could be combined into one formatIt
* remove debug integration test config
debug output and logformat of json for integration test logs
* Use ## module doc to support docgen
* bump nim-poseidon2 to export fromBytes
Before the changes in this branch, fromBytes was likely being resolved by nim-stew, or other dependency. With the changes in this branch, that dependency was removed and fromBytes could no longer be resolved. By exporting fromBytes from nim-poseidon, the correct resolution is now happening.
* fixes to get compiling after rebasing master
* Add support for Result types being logged using formatIt
2024-01-23 07:35:03 +00:00
|
|
|
|
2023-08-01 23:47:57 +00:00
|
|
|
let kb = ? path.readAllBytes().mapFailure(CodexKeyError)
|
|
|
|
return PrivateKey.init(kb).mapFailure(CodexKeyError)
|