amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 12:37:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

http cookie 可以保存更丰富的信息

Browse Source
This commit is contained in:
xiongziliang 2019-08-20 12:09:43 +08:00
parent ae2587103d
commit 113b7842d9
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Http/HttpCookieManager.h
View File

@ -30,6 +30,7 @@
#include <memory> #include <memory>
#include <unordered_map> #include <unordered_map>
#include "Util/mini.h" #include "Util/mini.h"
#include "Util/util.h"
#include "Util/TimeTicker.h" #include "Util/TimeTicker.h"
#include "Network/Socket.h" #include "Network/Socket.h"
#include "Common/Parser.h" #include "Common/Parser.h"
@ -47,7 +48,7 @@ class HttpCookieManager;
/** /**
* cookie对象，用于保存cookie的一些相关属性 * cookie对象，用于保存cookie的一些相关属性
*/ */
class HttpServerCookie : public map<string,string> , public noncopyable{ class HttpServerCookie : public AnyStorage , public noncopyable{
public: public:
typedef std::shared_ptr<HttpServerCookie> Ptr; typedef std::shared_ptr<HttpServerCookie> Ptr;
/** /**
@ -108,6 +109,8 @@ public:
* @return * @return
*/ */
std::shared_ptr<lock_guard<mutex> > getLock(); std::shared_ptr<lock_guard<mutex> > getLock();
private: private:
string cookieExpireTime() const ; string cookieExpireTime() const ;
private: private:

10
src/Http/HttpSession.cpp
View File

@ -403,7 +403,7 @@ inline void HttpSession::canAccessPath(const string &path_in,bool is_dir,const f
//上次鉴权失败，如果url发生变更，那么也重新鉴权 //上次鉴权失败，如果url发生变更，那么也重新鉴权
if (_parser.Params().empty() || _parser.Params() == cookie->getUid()) { if (_parser.Params().empty() || _parser.Params() == cookie->getUid()) {
//url参数未变，那么判断无权限访问 //url参数未变，那么判断无权限访问
callback(accessErr.empty() ? "无权限访问该目录" : accessErr, nullptr); callback(accessErr.empty() ? "无权限访问该目录" : accessErr.get<string>(), nullptr);
return; return;
} }
} }
@ -427,9 +427,9 @@ inline void HttpSession::canAccessPath(const string &path_in,bool is_dir,const f
//对cookie上锁 //对cookie上锁
auto lck = cookie->getLock(); auto lck = cookie->getLock();
//记录用户能访问的路径 //记录用户能访问的路径
(*cookie)[kCookiePathKey] = cookie_path; (*cookie)[kCookiePathKey].set<string>(cookie_path);
//记录能否访问 //记录能否访问
(*cookie)[kAccessErrKey] = errMsg; (*cookie)[kAccessErrKey].set<string>(errMsg);
} }
auto strongSelf = weakSelf.lock(); auto strongSelf = weakSelf.lock();
@ -520,7 +520,7 @@ inline void HttpSession::Handle_Req_GET(int64_t &content_len) {
} }
auto headerOut = makeHttpHeader(bClose,strMeun.size()); auto headerOut = makeHttpHeader(bClose,strMeun.size());
if(cookie){ if(cookie){
headerOut["Set-Cookie"] = cookie->getCookie((*cookie)[kCookiePathKey]); headerOut["Set-Cookie"] = cookie->getCookie((*cookie)[kCookiePathKey].get<string>());
} }
sendResponse(errMsg.empty() ? "200 OK" : "401 Unauthorized" , headerOut, strMeun); sendResponse(errMsg.empty() ? "200 OK" : "401 Unauthorized" , headerOut, strMeun);
throw SockException(bClose ? Err_shutdown : Err_success,"close connection after access folder"); throw SockException(bClose ? Err_shutdown : Err_success,"close connection after access folder");
@ -555,7 +555,7 @@ inline void HttpSession::Handle_Req_GET(int64_t &content_len) {
if(!errMsg.empty()){ if(!errMsg.empty()){
auto headerOut = makeHttpHeader(bClose,errMsg.size()); auto headerOut = makeHttpHeader(bClose,errMsg.size());
if(cookie){ if(cookie){
headerOut["Set-Cookie"] = cookie->getCookie((*cookie)[kCookiePathKey]); headerOut["Set-Cookie"] = cookie->getCookie((*cookie)[kCookiePathKey].get<string>());
} }
sendResponse("401 Unauthorized" , headerOut, errMsg); sendResponse("401 Unauthorized" , headerOut, errMsg);
throw SockException(bClose ? Err_shutdown : Err_success,"close connection after access file failed"); throw SockException(bClose ? Err_shutdown : Err_success,"close connection after access file failed");