From 034e29b25a229faa8e45d5539ce73c8ce7e4401a Mon Sep 17 00:00:00 2001 From: ziyue <1213642868@qq.com> Date: Tue, 15 Nov 2022 20:52:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Drtsp=20basic=E9=89=B4?= =?UTF-8?q?=E6=9D=83=E7=9B=B8=E5=85=B3bug:=20#2087?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Extension/H264.cpp | 16 ++++++---------- src/Rtsp/RtspPlayer.cpp | 26 ++++++++++++-------------- src/Rtsp/RtspPusher.cpp | 6 ++---- src/Rtsp/RtspSession.cpp | 29 ++++++++++++----------------- 4 files changed, 32 insertions(+), 45 deletions(-) diff --git a/src/Extension/H264.cpp b/src/Extension/H264.cpp index 3426f5cc..00217df8 100644 --- a/src/Extension/H264.cpp +++ b/src/Extension/H264.cpp @@ -245,23 +245,19 @@ public: _printer << "a=rtpmap:" << payload_type << " " << getCodecName() << "/" << 90000 << "\r\n"; _printer << "a=fmtp:" << payload_type << " packetization-mode=1; profile-level-id="; - char strTemp[1024]; uint32_t profile_level_id = 0; if (strSPS.length() >= 4) { // sanity check profile_level_id = (uint8_t(strSPS[1]) << 16) | (uint8_t(strSPS[2]) << 8) | (uint8_t(strSPS[3])); // profile_idc|constraint_setN_flag|level_idc } - memset(strTemp, 0, sizeof(strTemp)); - snprintf(strTemp, sizeof(strTemp), "%06X", profile_level_id); - _printer << strTemp; + + char profile[8]; + snprintf(profile, sizeof(profile), "%06X", profile_level_id); + _printer << profile; _printer << "; sprop-parameter-sets="; - memset(strTemp, 0, sizeof(strTemp)); - av_base64_encode(strTemp, sizeof(strTemp), (uint8_t *)strSPS.data(), (int)strSPS.size()); - _printer << strTemp << ","; - memset(strTemp, 0, sizeof(strTemp)); - av_base64_encode(strTemp, sizeof(strTemp), (uint8_t *)strPPS.data(), (int)strPPS.size()); - _printer << strTemp << "\r\n"; + _printer << encodeBase64(strSPS) << ","; + _printer << encodeBase64(strPPS) << "\r\n"; _printer << "a=control:trackID=" << (int)TrackVideo << "\r\n"; } diff --git a/src/Rtsp/RtspPlayer.cpp b/src/Rtsp/RtspPlayer.cpp index e94e8dcd..ec63a08e 100644 --- a/src/Rtsp/RtspPlayer.cpp +++ b/src/Rtsp/RtspPlayer.cpp @@ -580,16 +580,16 @@ void RtspPlayer::sendRtspRequest(const string &cmd, const string &url, const std void RtspPlayer::sendRtspRequest(const string &cmd, const string &url,const StrCaseMap &header_const) { auto header = header_const; - header.emplace("CSeq",StrPrinter << _cseq_send++); - header.emplace("User-Agent",kServerName); + header.emplace("CSeq", StrPrinter << _cseq_send++); + header.emplace("User-Agent", kServerName); - if(!_session_id.empty()){ + if (!_session_id.empty()) { header.emplace("Session", _session_id); } - if(!_realm.empty() && !(*this)[Client::kRtspUser].empty()){ - if(!_md5_nonce.empty()){ - //MD5认证 + if (!_realm.empty() && !(*this)[Client::kRtspUser].empty()) { + if (!_md5_nonce.empty()) { + // MD5认证 /* response计算方法如下： RTSP客户端应该使用username + password并计算response如下: @@ -599,7 +599,7 @@ void RtspPlayer::sendRtspRequest(const string &cmd, const string &url,const StrC response= md5( md5(username:realm:password):nonce:md5(public_method:url) ); */ string encrypted_pwd = (*this)[Client::kRtspPwd]; - if(!(*this)[Client::kRtspPwdIsMD5].as()){ + if (!(*this)[Client::kRtspPwdIsMD5].as()) { encrypted_pwd = MD5((*this)[Client::kRtspUser] + ":" + _realm + ":" + encrypted_pwd).hexdigest(); } auto response = MD5(encrypted_pwd + ":" + _md5_nonce + ":" + MD5(cmd + ":" + url).hexdigest()).hexdigest(); @@ -610,13 +610,11 @@ void RtspPlayer::sendRtspRequest(const string &cmd, const string &url,const StrC printer << "nonce=\"" << _md5_nonce << "\", "; printer << "uri=\"" << url << "\", "; printer << "response=\"" << response << "\""; - header.emplace("Authorization",printer); - }else if(!(*this)[Client::kRtspPwdIsMD5].as()){ - //base64认证 - string authStr = StrPrinter << (*this)[Client::kRtspUser] << ":" << (*this)[Client::kRtspPwd]; - char authStrBase64[1024] = {0}; - av_base64_encode(authStrBase64, sizeof(authStrBase64), (uint8_t *) authStr.data(), (int) authStr.size()); - header.emplace("Authorization",StrPrinter << "Basic " << authStrBase64 ); + header.emplace("Authorization", printer); + } else if (!(*this)[Client::kRtspPwdIsMD5].as()) { + // base64认证 + auto authStrBase64 = encodeBase64((*this)[Client::kRtspUser] + ":" + (*this)[Client::kRtspPwd]); + header.emplace("Authorization", StrPrinter << "Basic " << authStrBase64); } } diff --git a/src/Rtsp/RtspPusher.cpp b/src/Rtsp/RtspPusher.cpp index a1fc6e48..ab783e10 100644 --- a/src/Rtsp/RtspPusher.cpp +++ b/src/Rtsp/RtspPusher.cpp @@ -537,10 +537,8 @@ void RtspPusher::sendRtspRequest(const string &cmd, const string &url,const StrC printer << "response=\"" << response << "\""; header.emplace("Authorization", printer); } else if (!(*this)[Client::kRtspPwdIsMD5].as()) { - //base64认证 - string authStr = StrPrinter << (*this)[Client::kRtspUser] << ":" << (*this)[Client::kRtspPwd]; - char authStrBase64[1024] = {0}; - av_base64_encode(authStrBase64, sizeof(authStrBase64), (uint8_t *) authStr.data(), (int)authStr.size()); + // base64认证 + auto authStrBase64 = encodeBase64((*this)[Client::kRtspUser] + ":" + (*this)[Client::kRtspPwd]); header.emplace("Authorization", StrPrinter << "Basic " << authStrBase64); } } diff --git a/src/Rtsp/RtspSession.cpp b/src/Rtsp/RtspSession.cpp index b204c03d..0faf852a 100644 --- a/src/Rtsp/RtspSession.cpp +++ b/src/Rtsp/RtspSession.cpp @@ -448,31 +448,26 @@ void RtspSession::onAuthSuccess() { } void RtspSession::onAuthFailed(const string &realm,const string &why,bool close) { - GET_CONFIG(bool,authBasic,Rtsp::kAuthBasic); + GET_CONFIG(bool, authBasic, Rtsp::kAuthBasic); if (!authBasic) { - //我们需要客户端优先以md5方式认证 + // 我们需要客户端优先以md5方式认证 _auth_nonce = makeRandStr(32); - sendRtspResponse("401 Unauthorized", - {"WWW-Authenticate", - StrPrinter << "Digest realm=\"" << realm << "\",nonce=\"" << _auth_nonce << "\"" }); - }else { - //当然我们也支持base64认证,但是我们不建议这样做 - sendRtspResponse("401 Unauthorized", - {"WWW-Authenticate", - StrPrinter << "Basic realm=\"" << realm << "\"" }); + sendRtspResponse("401 Unauthorized", { "WWW-Authenticate", StrPrinter << "Digest realm=\"" << realm << "\",nonce=\"" << _auth_nonce << "\"" }); + } else { + // 当然我们也支持base64认证,但是我们不建议这样做 + sendRtspResponse("401 Unauthorized", { "WWW-Authenticate", StrPrinter << "Basic realm=\"" << realm << "\"" }); } - if(close){ - shutdown(SockException(Err_shutdown,StrPrinter << "401 Unauthorized:" << why)); + if (close) { + shutdown(SockException(Err_shutdown, StrPrinter << "401 Unauthorized:" << why)); } } -void RtspSession::onAuthBasic(const string &realm,const string &auth_base64){ +void RtspSession::onAuthBasic(const string &realm, const string &auth_base64) { //base64认证 - char user_pwd_buf[512]; - av_base64_decode((uint8_t *) user_pwd_buf, auth_base64.data(), (int)auth_base64.size()); - auto user_pwd_vec = split(user_pwd_buf, ":"); + auto user_passwd = decodeBase64(auth_base64); + auto user_pwd_vec = split(user_passwd, ":"); if (user_pwd_vec.size() < 2) { - //认证信息格式不合法，回复401 Unauthorized + // 认证信息格式不合法，回复401 Unauthorized onAuthFailed(realm, "can not find user and passwd when basic64 auth"); return; }