mirror of
https://gitlab.com/pulsechaincom/prysm-pulse.git
synced 2024-12-23 03:51:29 +00:00
92932ae58e
* Change LowestSignedProposal to Also Return a Boolean for Slashing Protection (#8020) * amend to use bools * ineff assign * comment * Update `LowestSignedTargetEpoch` to include exists (#8004) * Replace highest with lowerest * Update validator/db/kv/attestation_history_v2.go Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> * Update validator/db/kv/attestation_history_v2.go Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> * Invert equality for saveLowestSourceTargetToDB * Add eip checks to ensure epochs cant be lower than db ones * Should be less than equal to * Check if epoch exists in DB getters * Revert run time checks Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Export Attesting History for Slashing Interchange Standard (#8027) * added in att history checks * logic for export * export return nil * test for export atts * round trip passes first try! * rem println * fix up tests * pass test * Validate Proposers Are Not Slashable With Regard to Data Within Slasher Interchange JSON (#8031) * filter slashable blocks and atts in same json stub * add filter blocks func * add test for filtering out the bad public keys * Export Slashing Protection History Via CLI (#8040) * include cli entrypoint for history exports * builds properly * test to confirm we export the data as expected * abstract helpers properly * full test suite * gaz * better errors * marshal ident * Add the additional eip-3076 attestation checks (#7966) * Replace highest with lowerest * Update validator/db/kv/attestation_history_v2.go Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> * Update validator/db/kv/attestation_history_v2.go Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> * Invert equality for saveLowestSourceTargetToDB * Add eip checks to ensure epochs cant be lower than db ones * Should be less than equal to * Check if epoch exists in DB getters Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> * Add EIP-3076 Invariants for Proposer Slashing Protection (#8067) * add invariant for proposer protection * write different test cases * pass tests * Add EIP-3076 Interchange JSON CLI command to validator (#7880) * Import JSON CLI * CLI impotr * f * Begin adding new commands in slashing protection * Move testing helpers to separate packae * Add command for importing slashing protection JSONs * fix import cycle * fix test * Undo cleaning changes * Improvements * Add better prompts * Fix prompt * Fix * Fix * Fix * Fix conflict * Fix * Fixes * Fixes * Fix exported func * test func * Fixes * fix test * simplify import and standardize with export * add round trip test * true integration test works * fix up comments * logrus * better error * fix build * build fix * Update validator/slashing-protection/cli_export.go Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com> * Update validator/slashing-protection/cli_import.go Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com> * fmt Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com> * Filter Slashable Attester Public Keys in Slashing Interchange Import (#8051) * filter slashable attesters from the same JSON * builds * fix up initially broken test * circular dep * import fix * giz * added in attesting history package * add test for filter slashable attester keys * pass tests * Save Slashable Keys to Disk in the Validator Client (#8082) * begin db funcs * add in test and bucket * gaz * rem changes to import * ineff assign * add godoc * Properly Handle Duplicate Public Key Entries in Slashing Interchange Imports (#8089) * Prevent Blacklisted Public Keys from Slashing Protection Imports from Having Duties at Runtime (#8084) * tests on update duties * ensure the slashable public keys are filtered out from update duties via test * begin test * attempt test * rename for better context * pass tests * deep source * ensure tests pass * Check for Signing Root Mismatch When Submitting Proposals and Importing Proposals in Slashing Interchange (#8085) * flexible signing root * add test * add tests * fix test * Preston's comments * res tests * ensure we consider the case for minimum proposals * pass test * tests passing * rem unused code * Set Empty Epochs in Between Attestations as FAR_FUTURE_EPOCH in Attesting History (#8113) * set target data * all tests passing * ineff assign * signing root * Add Slashing Interchange, EIP-3076, Spec Tests to Prysm (#7858) * Add interchange test framework * add checks for attestations * Import genesis root if necessary * flexible signing root * add test * Sync * fix up test build * only 3 failing tests now * two failing * attempting to debug problems in conformity tests * include latest changes * protect test in validator/client passing * pass tests * imports * spec tests passing with bazel * gh archive link to spectests using tar.gz suffix * rev * rev more comment changes * fix sha * godoc * add back save Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> * Implement Migration for Unattested Epochs in Attesting History Database (#8121) * migrate attesting history backbone done * begin migration logic * implement migration logic * migration test * add test * migration logic * bazel * migration to its own file * Handle empty blocks and attestations in interchange json and sort interchange json by public key (#8132) * Handle empty blocks and attestations in interchange json * add test * sort json * easier empty arrays * pass test Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> * builds * more tests finally build * Align Slashing Interchange With Optimized Slashing Protection (#8268) * attestation history should account for multiple targets per source * attempt at some fixes * attempt some test fixes * experimenting with sorting * only one more failing test * tests now pass * slash protect tests passing * only few tests now failing * only spec tests failing now * spec tests passing * all tests passing * helper function for verifying double votes * use helper * gaz * deep source * tests fixed * expect specific number of times for domain data calls * final comments * Batch Save Imported EIP-3076 Attestations (#8304) * optimize save * test added * add test for sad path Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * revert bad find replace * add comment to db func Co-authored-by: terence tsao <terence@prysmaticlabs.com> Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: Ivan Martinez <ivanthegreatdev@gmail.com> Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com> Co-authored-by: Shay Zluf <thezluf@gmail.com>
173 lines
5.4 KiB
Go
173 lines
5.4 KiB
Go
package promptutil
|
|
|
|
import (
|
|
"bufio"
|
|
"fmt"
|
|
"io"
|
|
"io/ioutil"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/logrusorgru/aurora"
|
|
"github.com/pkg/errors"
|
|
"github.com/prysmaticlabs/prysm/shared/fileutil"
|
|
log "github.com/sirupsen/logrus"
|
|
"github.com/urfave/cli/v2"
|
|
"golang.org/x/crypto/ssh/terminal"
|
|
)
|
|
|
|
var au = aurora.NewAurora(true)
|
|
|
|
// PasswordReaderFunc takes in a *file and returns a password using the terminal package
|
|
func passwordReaderFunc(file *os.File) ([]byte, error) {
|
|
pass, err := terminal.ReadPassword(int(file.Fd()))
|
|
return pass, err
|
|
}
|
|
|
|
// PasswordReader has passwordReaderFunc as the default but can be changed for testing purposes.
|
|
var PasswordReader = passwordReaderFunc
|
|
|
|
// ValidatePrompt requests the user for text and expects the user to fulfill the provided validation function.
|
|
func ValidatePrompt(r io.Reader, promptText string, validateFunc func(string) error) (string, error) {
|
|
var responseValid bool
|
|
var response string
|
|
for !responseValid {
|
|
fmt.Printf("%s:\n", au.Bold(promptText))
|
|
scanner := bufio.NewScanner(r)
|
|
if ok := scanner.Scan(); ok {
|
|
item := scanner.Text()
|
|
response = strings.TrimRight(item, "\r\n")
|
|
if err := validateFunc(response); err != nil {
|
|
fmt.Printf("Entry not valid: %s\n", au.BrightRed(err))
|
|
} else {
|
|
responseValid = true
|
|
}
|
|
} else {
|
|
return "", errors.New("could not scan text input")
|
|
}
|
|
}
|
|
return response, nil
|
|
}
|
|
|
|
// DefaultPrompt prompts the user for any text and performs no validation. If nothing is entered it returns the default.
|
|
func DefaultPrompt(promptText, defaultValue string) (string, error) {
|
|
var response string
|
|
if defaultValue != "" {
|
|
fmt.Printf("%s %s:\n", promptText, fmt.Sprintf("(%s: %s)", au.BrightGreen("default"), defaultValue))
|
|
} else {
|
|
fmt.Printf("%s:\n", promptText)
|
|
}
|
|
scanner := bufio.NewScanner(os.Stdin)
|
|
if ok := scanner.Scan(); ok {
|
|
item := scanner.Text()
|
|
response = strings.TrimRight(item, "\r\n")
|
|
if response == "" {
|
|
return defaultValue, nil
|
|
}
|
|
return response, nil
|
|
}
|
|
return "", errors.New("could not scan text input")
|
|
}
|
|
|
|
// DefaultAndValidatePrompt prompts the user for any text and expects it to fulfill a validation function. If nothing is entered
|
|
// the default value is returned.
|
|
func DefaultAndValidatePrompt(promptText, defaultValue string, validateFunc func(string) error) (string, error) {
|
|
var responseValid bool
|
|
var response string
|
|
for !responseValid {
|
|
fmt.Printf("%s %s:\n", promptText, fmt.Sprintf("(%s: %s)", au.BrightGreen("default"), defaultValue))
|
|
scanner := bufio.NewScanner(os.Stdin)
|
|
if ok := scanner.Scan(); ok {
|
|
item := scanner.Text()
|
|
response = strings.TrimRight(item, "\r\n")
|
|
if response == "" {
|
|
return defaultValue, nil
|
|
}
|
|
if err := validateFunc(response); err != nil {
|
|
fmt.Printf("Entry not valid: %s\n", au.BrightRed(err))
|
|
} else {
|
|
responseValid = true
|
|
}
|
|
} else {
|
|
return "", errors.New("could not scan text input")
|
|
}
|
|
}
|
|
return response, nil
|
|
}
|
|
|
|
// PasswordPrompt prompts the user for a password, that repeatedly requests the password until it qualifies the
|
|
// passed in validation function.
|
|
func PasswordPrompt(promptText string, validateFunc func(string) error) (string, error) {
|
|
var responseValid bool
|
|
var response string
|
|
for !responseValid {
|
|
fmt.Printf("%s: ", au.Bold(promptText))
|
|
bytePassword, err := PasswordReader(os.Stdin)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
response = strings.TrimRight(string(bytePassword), "\r\n")
|
|
if err := validateFunc(response); err != nil {
|
|
fmt.Printf("\nEntry not valid: %s\n", au.BrightRed(err))
|
|
} else {
|
|
fmt.Println("")
|
|
responseValid = true
|
|
}
|
|
}
|
|
return response, nil
|
|
}
|
|
|
|
// InputPassword with a custom validator along capabilities of confirming
|
|
// the password and reading it from disk if a specified flag is set.
|
|
func InputPassword(
|
|
cliCtx *cli.Context,
|
|
passwordFileFlag *cli.StringFlag,
|
|
promptText, confirmText string,
|
|
shouldConfirmPassword bool,
|
|
passwordValidator func(input string) error,
|
|
) (string, error) {
|
|
if cliCtx.IsSet(passwordFileFlag.Name) {
|
|
passwordFilePathInput := cliCtx.String(passwordFileFlag.Name)
|
|
passwordFilePath, err := fileutil.ExpandPath(passwordFilePathInput)
|
|
if err != nil {
|
|
return "", errors.Wrap(err, "could not determine absolute path of password file")
|
|
}
|
|
data, err := ioutil.ReadFile(passwordFilePath)
|
|
if err != nil {
|
|
return "", errors.Wrap(err, "could not read password file")
|
|
}
|
|
enteredPassword := strings.TrimRight(string(data), "\r\n")
|
|
if err := passwordValidator(enteredPassword); err != nil {
|
|
return "", errors.Wrap(err, "password did not pass validation")
|
|
}
|
|
return enteredPassword, nil
|
|
}
|
|
if strings.Contains(strings.ToLower(promptText), "new wallet") {
|
|
fmt.Println("Password requirements: at least 8 characters including at least 1 alphabetical character, 1 number, and 1 unicode special character. " +
|
|
"Must not be a common password nor easy to guess")
|
|
}
|
|
var hasValidPassword bool
|
|
var password string
|
|
var err error
|
|
for !hasValidPassword {
|
|
password, err = PasswordPrompt(promptText, passwordValidator)
|
|
if err != nil {
|
|
return "", fmt.Errorf("could not read password: %w", err)
|
|
}
|
|
if shouldConfirmPassword {
|
|
passwordConfirmation, err := PasswordPrompt(confirmText, passwordValidator)
|
|
if err != nil {
|
|
return "", fmt.Errorf("could not read password confirmation: %w", err)
|
|
}
|
|
if password != passwordConfirmation {
|
|
log.Error("Passwords do not match")
|
|
continue
|
|
}
|
|
hasValidPassword = true
|
|
} else {
|
|
return password, nil
|
|
}
|
|
}
|
|
return password, nil
|
|
}
|