Bug 1332163: Only perform transport attribute validation if the msection owns its transport. r=mjf (37538955) · Commits · Dan Ballard / Mullvad Browser

dom/media/webrtc/jsep/JsepSessionImpl.cpp

+4 −59

Original line number	Diff line number	Diff line
		@@ -1425,39 +1425,6 @@ nsresult JsepSessionImpl::ParseSdp(const std::string& sdp,
		return NS_ERROR_INVALID_ARG;
		}

		if (mediaAttrs.GetIceUfrag().empty()) {
		JSEP_SET_ERROR("Invalid description, no ice-ufrag attribute");
		return NS_ERROR_INVALID_ARG;
		}

		if (mediaAttrs.GetIcePwd().empty()) {
		JSEP_SET_ERROR("Invalid description, no ice-pwd attribute");
		return NS_ERROR_INVALID_ARG;
		}

		if (!mediaAttrs.HasAttribute(SdpAttribute::kFingerprintAttribute)) {
		JSEP_SET_ERROR("Invalid description, no fingerprint attribute");
		return NS_ERROR_INVALID_ARG;
		}

		const SdpFingerprintAttributeList& fingerprints(
		mediaAttrs.GetFingerprint());
		if (fingerprints.mFingerprints.empty()) {
		JSEP_SET_ERROR(
		"Invalid description, no supported fingerprint algorithms "
		"present");
		return NS_ERROR_INVALID_ARG;
		}

		if (mediaAttrs.HasAttribute(SdpAttribute::kSetupAttribute, true) &&
		mediaAttrs.GetSetup().mRole == SdpSetupAttribute::kHoldconn) {
		JSEP_SET_ERROR(
		"Description has illegal setup attribute "
		"\"holdconn\" in m-section at level "
		<< i);
		return NS_ERROR_INVALID_ARG;
		}

		if (mediaAttrs.HasAttribute(SdpAttribute::kExtmapAttribute)) {
		std::set<uint16_t> extIds;
		for (const auto& ext : mediaAttrs.GetExtmap().mExtmaps) {
		@@ -1934,23 +1901,7 @@ nsresult JsepSessionImpl::ValidateRemoteDescription(const Sdp& description) {
		}

		nsresult JsepSessionImpl::ValidateOffer(const Sdp& offer) {
		for (size_t i = 0; i < offer.GetMediaSectionCount(); ++i) {
		const SdpMediaSection& offerMsection = offer.GetMediaSection(i);
		if (mSdpHelper.MsectionIsDisabled(offerMsection)) {
		continue;
		}

		const SdpAttributeList& offerAttrs(offerMsection.GetAttributeList());
		if (!offerAttrs.HasAttribute(SdpAttribute::kSetupAttribute, true)) {
		JSEP_SET_ERROR(
		"Offer is missing required setup attribute "
		" at level "
		<< i);
		return NS_ERROR_INVALID_ARG;
		}
		}

		return NS_OK;
		return mSdpHelper.ValidateTransportAttributes(offer, sdp::kOffer);
		}

		nsresult JsepSessionImpl::ValidateAnswer(const Sdp& offer, const Sdp& answer) {
		@@ -1961,6 +1912,9 @@ nsresult JsepSessionImpl::ValidateAnswer(const Sdp& offer, const Sdp& answer) {
		return NS_ERROR_INVALID_ARG;
		}

		nsresult rv = mSdpHelper.ValidateTransportAttributes(answer, sdp::kAnswer);
		NS_ENSURE_SUCCESS(rv, rv);

		for (size_t i = 0; i < offer.GetMediaSectionCount(); ++i) {
		const SdpMediaSection& offerMsection = offer.GetMediaSection(i);
		const SdpMediaSection& answerMsection = answer.GetMediaSection(i);
		@@ -2003,15 +1957,6 @@ nsresult JsepSessionImpl::ValidateAnswer(const Sdp& offer, const Sdp& answer) {
		return NS_ERROR_INVALID_ARG;
		}

		if (answerAttrs.HasAttribute(SdpAttribute::kSetupAttribute, true) &&
		answerAttrs.GetSetup().mRole == SdpSetupAttribute::kActpass) {
		JSEP_SET_ERROR(
		"Answer contains illegal setup attribute \"actpass\""
		" at level "
		<< i);
		return NS_ERROR_INVALID_ARG;
		}

		// Sanity check extmap
		if (answerAttrs.HasAttribute(SdpAttribute::kExtmapAttribute)) {
		if (!offerAttrs.HasAttribute(SdpAttribute::kExtmapAttribute)) {

dom/media/webrtc/sdp/SdpHelper.cpp

+63 −0

Original line number	Diff line number	Diff line
		@@ -250,6 +250,10 @@ bool SdpHelper::OwnsTransport(const Sdp& sdp, uint16_t level,
		bool SdpHelper::OwnsTransport(const SdpMediaSection& msection,
		const BundledMids& bundledMids,
		sdp::SdpType type) {
		if (MsectionIsDisabled(msection)) {
		return false;
		}

		if (!msection.GetAttributeList().HasAttribute(SdpAttribute::kMidAttribute)) {
		// No mid, definitely no bundle for this m-section
		return true;
		@@ -731,4 +735,63 @@ bool SdpHelper::SdpMatch(const Sdp& sdp1, const Sdp& sdp2) {
		return true;
		}

		nsresult SdpHelper::ValidateTransportAttributes(const Sdp& aSdp,
		sdp::SdpType aType) {
		for (size_t level = 0; level < aSdp.GetMediaSectionCount(); ++level) {
		const auto& msection = aSdp.GetMediaSection(level);
		if (OwnsTransport(aSdp, level, aType)) {
		const auto& mediaAttrs = msection.GetAttributeList();
		if (mediaAttrs.GetIceUfrag().empty()) {
		SDP_SET_ERROR("Invalid description, no ice-ufrag attribute at level "
		<< level);
		return NS_ERROR_INVALID_ARG;
		}

		if (mediaAttrs.GetIcePwd().empty()) {
		SDP_SET_ERROR("Invalid description, no ice-pwd attribute at level "
		<< level);
		return NS_ERROR_INVALID_ARG;
		}

		if (!mediaAttrs.HasAttribute(SdpAttribute::kFingerprintAttribute)) {
		SDP_SET_ERROR("Invalid description, no fingerprint attribute at level "
		<< level);
		return NS_ERROR_INVALID_ARG;
		}

		const SdpFingerprintAttributeList& fingerprints(
		mediaAttrs.GetFingerprint());
		if (fingerprints.mFingerprints.empty()) {
		SDP_SET_ERROR(
		"Invalid description, no supported fingerprint algorithms present "
		"at level "
		<< level);
		return NS_ERROR_INVALID_ARG;
		}

		if (mediaAttrs.HasAttribute(SdpAttribute::kSetupAttribute, true)) {
		if (mediaAttrs.GetSetup().mRole == SdpSetupAttribute::kHoldconn) {
		SDP_SET_ERROR(
		"Invalid description, illegal setup attribute \"holdconn\" "
		"at level "
		<< level);
		return NS_ERROR_INVALID_ARG;
		}

		if (aType == sdp::kAnswer &&
		mediaAttrs.GetSetup().mRole == SdpSetupAttribute::kActpass) {
		SDP_SET_ERROR(
		"Invalid answer, illegal setup attribute \"actpass\" at level "
		<< level);
		return NS_ERROR_INVALID_ARG;
		}
		} else if (aType == sdp::kOffer) {
		SDP_SET_ERROR("Invalid offer, no setup attribute at level " << level);
		return NS_ERROR_INVALID_ARG;
		}
		}
		}
		return NS_OK;
		}

		} // namespace mozilla

dom/media/webrtc/sdp/SdpHelper.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -97,6 +97,7 @@ class SdpHelper {
		SdpMediaSection* localMsection);

		bool SdpMatch(const Sdp& sdp1, const Sdp& sdp2);
		nsresult ValidateTransportAttributes(const Sdp& aSdp, sdp::SdpType aType);

		private:
		std::string& mLastError;