Merge pull request #18 from Patrick-Star-CN/main

修复了正方的bug
zjutjh · Jan 22, 2024 · b6fc622 · b6fc622
2 parents 0af2b0d + 7bbdc4e
commit b6fc622
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 20 deletions.
diff --git a/app/controller/controllerHandle.go b/app/controller/controllerHandle.go
@@ -29,6 +29,11 @@ func ErrorHandle(context *gin.Context, err error) {
 			exp = errors.SessionExpired
 			break
 		}
+	case errors.ERR_OAUTH_ERROR:
+		{
+			exp = errors.OauthError
+			break
+		}
 	}
 
 	println(err.Error())

diff --git a/app/controller/zfController/controllerHandle.go b/app/controller/zfController/controllerHandle.go
@@ -19,6 +19,10 @@ func ZFTermInfoHandle(context *gin.Context, cb func(*model.User, string, string)
 
 	if err == errors.ERR_Session_Expired {
 		user, err = controller.LoginHandle(context, zfService.GetUser, false)
+		if err != nil {
+			controller.ErrorHandle(context, err)
+			return nil, err
+		}
 		result, err = cb(user, context.PostForm("year"), context.PostForm("term"))
 	}
 

diff --git a/app/controller/zfController/zfController.go b/app/controller/zfController/zfController.go
@@ -121,12 +121,14 @@ func GetProgInfo(context *gin.Context) {
 
 	user, err := controller.LoginHandle(context, zfService.GetUser, false)
 	if err != nil {
+		controller.ErrorHandle(context, err)
 		return
 	}
 	result, err := zfService.GetTrainingPrograms(user)
 	if err == errors.ERR_SESSION_EXPIRES {
 		user, err = controller.LoginHandle(context, zfService.GetUser, false)
 		if err != nil {
+			controller.ErrorHandle(context, err)
 			return
 		}
 		result, err = zfService.GetTrainingPrograms(user)

diff --git a/app/errors/funnelErrors.go b/app/errors/funnelErrors.go
@@ -11,3 +11,4 @@ var ERR_WRONG_Captcha = errors.New("ERR_WRONG_Captcha")
 var ERR_INVALID_ARGS = errors.New("invalid args")
 var ERR_SESSION_NOT_EXIST = errors.New("ERR_SESSION_NOT_EXIST")
 var ERR_SESSION_EXPIRES = errors.New("ERR_SESSION_EXPIRES")
+var ERR_OAUTH_ERROR = errors.New("ERR_OAUTH_ERROR")
diff --git a/app/errors/httpResponseErrors.go b/app/errors/httpResponseErrors.go
@@ -13,3 +13,4 @@ var InvalidArgs = HttpResponseError{410, "参数错误"}
 var WrongPassword = HttpResponseError{412, "密码错误"}
 var CaptchaFailed = HttpResponseError{413, "验证码错误"}
 var SessionExpired = HttpResponseError{414, "缓存过期"}
+var OauthError = HttpResponseError{415, "缓存过期"}
diff --git a/app/model/user.go b/app/model/user.go
@@ -6,4 +6,5 @@ type User struct {
 	Username string
 	Password string
 	Session  http.Cookie
+	Route    http.Cookie
 }
diff --git a/app/service/libraryService/login.go b/app/service/libraryService/login.go
@@ -37,5 +37,5 @@ func login(username string, password string) (*model.User, error) {
 	if len(f.Cookie) == 0 || err != nil {
 		return nil, errors.ERR_WRONG_PASSWORD
 	}
-	return service.SetUser(service.LibraryPrefix, username, password, f.Cookie[0])
+	return service.SetUser(service.LibraryPrefix, username, password, f.Cookie[0], nil)
 }
diff --git a/app/service/serviceUniFunction.go b/app/service/serviceUniFunction.go
@@ -34,10 +34,10 @@ func GetUser(prefix string, username string, password string) (*model.User, erro
 	return user, nil
 }
 
-func SetUser(prefix string, username string, password string, cookie *http.Cookie) (*model.User, error) {
-	user := model.User{Username: username, Password: password, Session: *cookie}
+func SetUser(prefix string, username string, password string, sessionCookie *http.Cookie, routeCookie *http.Cookie) (*model.User, error) {
+	user := model.User{Username: username, Password: password, Session: *sessionCookie, Route: *routeCookie}
 	userJson, _ := json.Marshal(user)
-	config.Redis.Set(getRediskey(prefix, username, password), string(userJson), cookie.Expires.Sub(time.Now().Add(time.Minute*5)))
+	config.Redis.Set(getRediskey(prefix, username, password), string(userJson), sessionCookie.Expires.Sub(time.Now().Add(time.Minute*5)))
 	return &user, nil
 }
 

diff --git a/app/service/zfService/login.go b/app/service/zfService/login.go
@@ -37,15 +37,13 @@ func login(username string, password string) (*model.User, error) {
 	if len(f.Cookie) < 1 {
 		return nil, errors.ERR_UNKNOWN_LOGIN_ERROR
 	}
-
 	var URL string
 	if strings.Compare(config.Redis.Get("zf_url").String(), "new") == 0 {
 		URL = apis.CAPTCHA_NEW_BREAKER_URL
 	} else {
 		URL = apis.CAPTCHA_BREAKER_URL
 	}
-
-	captcha, err := f.Get(URL + f.Cookie[0].Value)
+	captcha, err := f.Get(URL + "?session=" + f.Cookie[0].Value + "&route=" + f.Cookie[1].Value)
 	if err != nil {
 		return nil, err
 	}
@@ -67,16 +65,20 @@ func login(username string, password string) (*model.User, error) {
 	if strings.Contains(string(s), "用户名或密码不正确") {
 		return nil, errors.ERR_WRONG_PASSWORD
 	}
-	var cookie *http.Cookie
+	var sessionCookie *http.Cookie
+	var routeCookie *http.Cookie
 	for _, v := range f.Cookie {
 		if v.Name == "JSESSIONID" {
-			cookie = v
+			sessionCookie = v
+		}
+		if v.Name == "route" {
+			routeCookie = v
 		}
 	}
-	if cookie == nil {
+	if sessionCookie == nil {
 		return nil, errors.ERR_UNKNOWN_LOGIN_ERROR
 	}
-	return service.SetUser(service.ZFPrefix, username, password, cookie)
+	return service.SetUser(service.ZFPrefix, username, password, sessionCookie, routeCookie)
 }
 
 func loginByOauth(username string, password string) (*model.User, error) {
@@ -120,14 +122,18 @@ func loginByOauth(username string, password string) (*model.User, error) {
 	if err != nil {
 		return nil, err
 	}
-	var cookie *http.Cookie
+	var sessionCookie *http.Cookie
+	var routeCookie *http.Cookie
 	for _, v := range f.Cookie {
 		if v.Name == "JSESSIONID" {
-			cookie = v
+			sessionCookie = v
+		}
+		if v.Name == "route" {
+			routeCookie = v
 		}
 	}
-	if cookie == nil {
+	if sessionCookie == nil {
 		return nil, errors.ERR_UNKNOWN_LOGIN_ERROR
 	}
-	return service.SetUser(service.ZFPrefix, username, password, cookie)
+	return service.SetUser(service.ZFPrefix, username, password, sessionCookie, routeCookie)
 }
diff --git a/app/service/zfService/zfService.go b/app/service/zfService/zfService.go
@@ -82,6 +82,7 @@ func fetchTermRelatedInfo(stu *model.User, requestUrl, year, term string, examIn
 	f := fetch.Fetch{}
 	f.Init()
 	f.Cookie = append(f.Cookie, &stu.Session)
+	f.Cookie = append(f.Cookie, &stu.Route)
 	if term == "上" {
 		term = "3"
 	} else if term == "下" {
@@ -112,6 +113,7 @@ func GetTrainingPrograms(stu *model.User) ([]byte, error) {
 	f := fetch.Fetch{}
 	f.Init()
 	f.Cookie = append(f.Cookie, &stu.Session)
+	f.Cookie = append(f.Cookie, &stu.Route)
 	response, err := f.GetRaw(zf.ZfUserInfo())
 
 	if err != nil {
@@ -135,6 +137,7 @@ func GetEmptyRoomInfo(stu *model.User, year string, term string, campus string,
 	f := fetch.Fetch{}
 	f.Init()
 	f.Cookie = append(f.Cookie, &stu.Session)
+	f.Cookie = append(f.Cookie, &stu.Route)
 	if term == "上" {
 		term = "3"
 	} else if term == "下" {

diff --git a/app/utils/fetch/fetch.go b/app/utils/fetch/fetch.go
@@ -2,7 +2,8 @@ package fetch
 
 import (
 	"crypto/tls"
-	"errors"
+	"fmt"
+	errors2 "funnel/app/errors"
 	"io"
 	"net/http"
 	"net/url"
@@ -18,7 +19,7 @@ type Fetch struct {
 func (f *Fetch) InitUnSafe() {
 	f.client = &http.Client{
 		CheckRedirect: func(req *http.Request, via []*http.Request) error { return http.ErrUseLastResponse },
-		Timeout:       time.Second * 2,
+		Timeout:       time.Second * 20,
 		Transport: &http.Transport{
 			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
 		},
@@ -28,7 +29,7 @@ func (f *Fetch) InitUnSafe() {
 func (f *Fetch) Init() {
 	f.client = &http.Client{
 		CheckRedirect: func(req *http.Request, via []*http.Request) error { return http.ErrUseLastResponse },
-		Timeout:       time.Second * 10,
+		Timeout:       time.Second * 20,
 	}
 }
 func (f *Fetch) SkipTlsCheck() {
@@ -55,7 +56,7 @@ func (f *Fetch) GetRedirect(url string) (*url.URL, error) {
 		return nil, err
 	}
 	if response.StatusCode != 302 {
-		return nil, errors.New("network_error")
+		return nil, errors2.ERR_OAUTH_ERROR
 	}
 	location, err := response.Location()
 	if err != nil {
@@ -106,7 +107,9 @@ func (f *Fetch) PostFormRedirect(url string, requestData url.Values) (*url.URL,
 		return nil, err
 	}
 	if response.StatusCode != 302 {
-		return nil, errors.New("network_error")
+		fmt.Println(url)
+		fmt.Println(response.StatusCode)
+		return nil, errors2.ERR_WRONG_PASSWORD
 	}
 	f.Cookie = cookieMerge(f.Cookie, response.Cookies())
 	return response.Location()