mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-09-13 05:38:05 -04:00
Isaac ConnorandClaude Opus 5
f1371f425f
The parameter existed so the predicate could be called without the gSOAP headers, but src/CMakeLists.txt:163 sets WITH_GSOAP as a PUBLIC compile definition on the zm target, so it already reaches the tests target that links it. The test could name SOAP_FAULT directly all along, and passing it in only meant every caller repeated the same constant. The declaration and definition move inside the WITH_GSOAP guard, where SOAP_FAULT is in scope, and the test is guarded to match. The predicate stays a free function rather than folding back into WaitForMessage: it is six conditions over two nullable strings, and covering it in place would mean constructing an ONVIF object and a live soap context. The comment now says that, instead of claiming a header dependency that was not real. Tests: 16 assertions unchanged and passing. Full suite 10160 assertions in 132 test cases. Builds clean. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015Y6FieTwEXuLhhR4e2yiax
73 lines
3.2 KiB
C++
73 lines
3.2 KiB
C++
/*
|
|
* This file is part of the ZoneMinder Project. See AUTHORS file for Copyright information
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the
|
|
* Free Software Foundation; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "zm_catch2.h"
|
|
#include "zm_monitor_onvif.h"
|
|
|
|
// The predicate only exists in an ONVIF-enabled build, which is also the only
|
|
// build that has SOAP_FAULT to name here.
|
|
#ifdef WITH_GSOAP
|
|
|
|
TEST_CASE("ONVIFIsAuthError", "[onvif]") {
|
|
SECTION("HTTP 401 is an auth failure even with no fault text") {
|
|
// gSOAP reports a transport-level rejection by returning the HTTP status,
|
|
// and there is no SOAP envelope to carry a reason. Cameras that demand
|
|
// WWW-Authenticate answer this way.
|
|
REQUIRE(ONVIFIsAuthError(401, nullptr, nullptr));
|
|
REQUIRE(ONVIFIsAuthError(401, "", ""));
|
|
}
|
|
|
|
SECTION("SOAP fault naming the reason in the fault string") {
|
|
REQUIRE(ONVIFIsAuthError(SOAP_FAULT, "Sender not authorized", nullptr));
|
|
REQUIRE(ONVIFIsAuthError(SOAP_FAULT, "NotAuthorized", nullptr));
|
|
REQUIRE(ONVIFIsAuthError(SOAP_FAULT, "The action requires authorization", nullptr));
|
|
REQUIRE(ONVIFIsAuthError(SOAP_FAULT, "Unauthorized", nullptr));
|
|
}
|
|
|
|
SECTION("SOAP fault naming the reason only in the detail") {
|
|
// Several cameras leave the fault string generic and put the real reason in
|
|
// the detail element, which is why matching the string alone missed them.
|
|
REQUIRE(ONVIFIsAuthError(SOAP_FAULT, "Sender", "NotAuthorized"));
|
|
REQUIRE(ONVIFIsAuthError(SOAP_FAULT, nullptr, "not authorized"));
|
|
REQUIRE(ONVIFIsAuthError(SOAP_FAULT, "", "Unauthorized"));
|
|
}
|
|
|
|
SECTION("Failures that are not about authentication") {
|
|
REQUIRE_FALSE(ONVIFIsAuthError(SOAP_FAULT, "Invalid argument", nullptr));
|
|
REQUIRE_FALSE(ONVIFIsAuthError(SOAP_FAULT, "ter:InvalidArgVal", "ter:NoSuchTopic"));
|
|
REQUIRE_FALSE(ONVIFIsAuthError(SOAP_FAULT, nullptr, nullptr));
|
|
}
|
|
|
|
SECTION("Other HTTP statuses are not auth failures") {
|
|
// 404 and 500 mean the request failed for some other reason, and must not
|
|
// be routed into the auth handling, which suppresses repeats.
|
|
REQUIRE_FALSE(ONVIFIsAuthError(404, nullptr, nullptr));
|
|
REQUIRE_FALSE(ONVIFIsAuthError(500, "Internal Error", nullptr));
|
|
// 403 is a refusal, but of an authenticated request; it is not fixed by
|
|
// re-authenticating, so it keeps the generic error path.
|
|
REQUIRE_FALSE(ONVIFIsAuthError(403, nullptr, nullptr));
|
|
}
|
|
|
|
SECTION("Auth wording in a non-fault, non-401 result does not count") {
|
|
// The reason text is only meaningful when the camera actually returned a
|
|
// SOAP fault; otherwise it is whatever happened to be left in the context.
|
|
REQUIRE_FALSE(ONVIFIsAuthError(28, "NotAuthorized", "not authorized"));
|
|
}
|
|
}
|
|
|
|
#endif // WITH_GSOAP
|