checker: add verbose flag
This commit is contained in:
parent
7adbd4402a
commit
daa0e00619
2 changed files with 14 additions and 0 deletions
|
@ -14,6 +14,7 @@ import (
|
||||||
)
|
)
|
||||||
|
|
||||||
var baseChallenge = 100
|
var baseChallenge = 100
|
||||||
|
var verbose = false
|
||||||
|
|
||||||
// ICMP
|
// ICMP
|
||||||
|
|
||||||
|
@ -86,10 +87,16 @@ func studentsChecker() {
|
||||||
std := s
|
std := s
|
||||||
stdIP := adlin.StudentIP(std.Id).String() + "1"
|
stdIP := adlin.StudentIP(std.Id).String() + "1"
|
||||||
go check_ping(stdIP, func(pkt *ping.Packet) {
|
go check_ping(stdIP, func(pkt *ping.Packet) {
|
||||||
|
if verbose {
|
||||||
|
log.Printf("%s PONG\n", std.Login)
|
||||||
|
}
|
||||||
std.OnPong(true)
|
std.OnPong(true)
|
||||||
|
|
||||||
// Check HTTP
|
// Check HTTP
|
||||||
if err := check_http(stdIP); err == nil {
|
if err := check_http(stdIP); err == nil {
|
||||||
|
if verbose {
|
||||||
|
log.Printf("%s just unlocked HTTP challenge\n", std.Login)
|
||||||
|
}
|
||||||
if _, err := std.UnlockNewChallenge(baseChallenge+0, ""); err != nil {
|
if _, err := std.UnlockNewChallenge(baseChallenge+0, ""); err != nil {
|
||||||
if _, err := std.UpdateUnlockedChallenge(baseChallenge+0, ""); err != nil {
|
if _, err := std.UpdateUnlockedChallenge(baseChallenge+0, ""); err != nil {
|
||||||
log.Printf("Unable to register challenge for %s: %s\n", std.Login, err.Error())
|
log.Printf("Unable to register challenge for %s: %s\n", std.Login, err.Error())
|
||||||
|
@ -99,6 +106,9 @@ func studentsChecker() {
|
||||||
|
|
||||||
// Check HTTPs
|
// Check HTTPs
|
||||||
if err := check_https(std.MyAssociatedDomain(), stdIP); err == nil {
|
if err := check_https(std.MyAssociatedDomain(), stdIP); err == nil {
|
||||||
|
if verbose {
|
||||||
|
log.Printf("%s just unlocked HTTPS challenge\n", std.Login)
|
||||||
|
}
|
||||||
if _, err := std.UnlockNewChallenge(baseChallenge+1, ""); err != nil {
|
if _, err := std.UnlockNewChallenge(baseChallenge+1, ""); err != nil {
|
||||||
if _, err := std.UpdateUnlockedChallenge(baseChallenge+1, ""); err != nil {
|
if _, err := std.UpdateUnlockedChallenge(baseChallenge+1, ""); err != nil {
|
||||||
log.Printf("Unable to register challenge for %s: %s\n", std.Login, err.Error())
|
log.Printf("Unable to register challenge for %s: %s\n", std.Login, err.Error())
|
||||||
|
@ -108,6 +118,9 @@ func studentsChecker() {
|
||||||
|
|
||||||
// Check DNS
|
// Check DNS
|
||||||
if err := check_dns(std.MyDelegatedDomain(), stdIP); err == nil {
|
if err := check_dns(std.MyDelegatedDomain(), stdIP); err == nil {
|
||||||
|
if verbose {
|
||||||
|
log.Printf("%s just unlocked DNS challenge\n", std.Login)
|
||||||
|
}
|
||||||
if _, err := std.UnlockNewChallenge(baseChallenge+2, ""); err != nil {
|
if _, err := std.UnlockNewChallenge(baseChallenge+2, ""); err != nil {
|
||||||
if _, err := std.UpdateUnlockedChallenge(baseChallenge+2, ""); err != nil {
|
if _, err := std.UpdateUnlockedChallenge(baseChallenge+2, ""); err != nil {
|
||||||
log.Printf("Unable to register challenge for %s: %s\n", std.Login, err.Error())
|
log.Printf("Unable to register challenge for %s: %s\n", std.Login, err.Error())
|
||||||
|
|
|
@ -14,6 +14,7 @@ import (
|
||||||
func main() {
|
func main() {
|
||||||
var dsn = flag.String("dsn", adlin.DSNGenerator(), "DSN to connect to the MySQL server")
|
var dsn = flag.String("dsn", adlin.DSNGenerator(), "DSN to connect to the MySQL server")
|
||||||
flag.IntVar(&baseChallenge, "basechallenge", baseChallenge, "Base number for current challenges")
|
flag.IntVar(&baseChallenge, "basechallenge", baseChallenge, "Base number for current challenges")
|
||||||
|
flag.BoolVar(&verbose, "verbose", verbose, "Enable verbose mode")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
// Initialize contents
|
// Initialize contents
|
||||||
|
|
Reference in a new issue