teach/adlin
Archived
0
0
Fork 0
Code Issues 1 Pull requests 4 Releases Activity

Add a challenge for shadow password

Browse source
This commit is contained in:
nemunaire 2023-02-20 12:33:26 +01:00
commit 5de31f10d7
3 changed files with 61 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
token-validator/challenge.go
View file

@ -237,6 +237,12 @@ var challenges []Challenge
func init() {
challenges = []Challenge{
/* Challenge 0 : shadow updated */
Challenge{
Accessible: []func(*adlin.Student, *http.Request) error{noAccessRestriction},
Check: challengeOk,
},
/* Challenge 1 : 42 */
Challenge{
Accessible: []func(*adlin.Student, *http.Request) error{noAccessRestriction},
@ -333,10 +339,10 @@ func getChallengeList(_ httprouter.Params, _ []byte) (interface{}, error) {
func accessibleChallenge(r *http.Request, ps httprouter.Params, _ []byte) (interface{}, error) {
if chid, err := strconv.Atoi(string(ps.ByName("chid"))); err != nil {
return nil, err
} else if chid == 0 || chid >= len(challenges) {
} else if chid == 0 || chid > len(challenges) {
return nil, errors.New("This challenge doesn't exist")
} else {
for _, a := range challenges[chid-1].Accessible {
for _, a := range challenges[chid].Accessible {
if err := a(nil, r); err != nil {
return nil, err
}
@ -345,12 +351,13 @@ func accessibleChallenge(r *http.Request, ps httprouter.Params, _ []byte) (inter
}
}
// receiveChallenge treats TP1{shadow} and TP2, TP3 challenges.
func receiveChallenge(r *http.Request, ps httprouter.Params, body []byte) (interface{}, error) {
if chid, err := strconv.Atoi(string(ps.ByName("chid"))); err != nil {
return nil, err
} else if chid == 0 {
} else if chid < 0 {
return nil, errors.New("This challenge doesn't exist")
} else if chid <= len(challenges) {
} else if chid != 0 && chid <= len(challenges) {
return nil, errors.New("This is not the good way to hit this challenge")
} else {
var gt givenToken
@ -382,6 +389,7 @@ func receiveChallenge(r *http.Request, ps httprouter.Params, body []byte) (inter
}
}
// receiveToken handles challenges for TP1 except shadow
func receiveToken(r *http.Request, body []byte, chid int) (interface{}, error) {
var gt givenToken
if err := json.Unmarshal(body, &gt); err != nil {
@ -398,12 +406,12 @@ func receiveToken(r *http.Request, body []byte, chid int) (interface{}, error) {
chid = gt.Challenge
}
if chid <= 0 || chid-1 > len(challenges) {
if chid <= 0 || chid > len(challenges) {
return nil, errors.New("This challenge doesn't exist")
}
// Is the challenge accessible?
for _, a := range challenges[chid-1].Accessible {
for _, a := range challenges[chid].Accessible {
if err := a(nil, r); err != nil {
return nil, err
}
@ -412,7 +420,7 @@ func receiveToken(r *http.Request, body []byte, chid int) (interface{}, error) {
if std, err := adlin.GetStudentByLogin(gt.Login); err != nil {
return nil, err
} else {
if err := challenges[chid-1].Check(std, &gt, chid); err != nil {
if err := challenges[chid].Check(std, &gt, chid); err != nil {
log.Printf("%s just try ch#%d: %s\n", std.Login, chid, err)
return nil, err
}

1
token-validator/htdocs/js/adlin-common.js
View file

@ -13,6 +13,7 @@ const tuto_legend = {
const tuto_progress = [
{
0: { title: "single", icon: "🕵️", label: "Shadow"},
1: { title: "Is alive?", icon: "👋", label: "Token 1"},
2: { title: "DMZ reached", icon: "📚", label: "Token 2"},
3: { title: "HTTPS on + time", icon: "⏲", label: "Token 3"},