Added method matching on rules

lib/http.go

@@ -106,6 +106,7 @@ func (state *State) handleRequest(w http.ResponseWriter, r *http.Request) {
 
 	//TODO better matcher! combo ast?
 	env := map[string]any{
+		"method":        r.Method,
 		"remoteAddress": state.GetRequestAddress(r),
 		"userAgent":     r.UserAgent(),
 		"path":          r.URL.Path,
@@ -219,7 +220,9 @@ func (state *State) setupRoutes() error {
 			state.Mux.Handle(fmt.Sprintf("POST %s/make-challenge", c.Path), c.MakeChallenge)
 		}
 
-		if c.Verify != nil {
+		if c.VerifyChallenge != nil {
+			state.Mux.Handle(fmt.Sprintf("GET %s/verify-challenge", c.Path), c.VerifyChallenge)
+		} else if c.Verify != nil {
 			state.Mux.HandleFunc(fmt.Sprintf("GET %s/verify-challenge", c.Path), func(w http.ResponseWriter, r *http.Request) {
 				err := func() (err error) {
 					expiry := time.Now().UTC().Add(DefaultValidity).Round(DefaultValidity)
@@ -250,7 +253,6 @@ func (state *State) setupRoutes() error {
 					return
 				}
 			})
-
 		}
 	}
 

lib/state.go

@@ -88,9 +88,9 @@ type ChallengeState struct {
 	ChallengeScript     http.Handler
 	MakeChallenge       http.Handler
 	VerifyChallenge     http.Handler
+	Verify              func(key []byte, result string) (bool, error)
 
 	VerifyProbability float64
-	Verify            func(key []byte, result string) (bool, error)
 }
 
 type StateSettings struct {
@@ -434,6 +434,7 @@ func NewState(p policy.Policy, settings StateSettings) (state *State, err error)
 	state.RulesEnv, err = cel.NewEnv(
 		cel.DefaultUTCTimeZone(true),
 		cel.Variable("remoteAddress", cel.BytesType),
+		cel.Variable("method", cel.StringType),
 		cel.Variable("userAgent", cel.StringType),
 		cel.Variable("path", cel.StringType),
 		cel.Variable("query", cel.MapType(cel.StringType, cel.StringType)),