Attachment #254426 for bug #281959




PORTNAME=	wt
DISTVERSION=	4.11.0
PORTREVISION=	1
CATEGORIES=	www

MAINTAINER=	info@babaei.net

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE

RUN_DEPENDS=	roboto-fonts-ttf>=0:x11-fonts/roboto-fonts-ttf
LIB_DEPENDS=	libpng.so:graphics/png \
		libboost_thread.so:devel/boost-libs \
		libGraphicsMagick.so:graphics/GraphicsMagick
TEST_RUN_DEPENDS=	roboto-fonts-ttf>=0:x11-fonts/roboto-fonts-ttf

USES=		cmake:testing compiler:c++14-lang cpe pkgconfig ssl
CPE_VENDOR=	emweb

		-DWEBGROUP:STRING=${WWWGRP} \
		-DWEBUSER:STRING=${WWWOWN} \
		-DWT_WRASTERIMAGE_IMPLEMENTATION:STRING=GraphicsMagick
CMAKE_OFF=	BUILD_EXAMPLES ENABLE_MYSQLSERVER \
		ENABLE_QT4 ENABLE_QT5 ENABLE_QT6
CMAKE_TESTING_ON=	BUILD_TESTS


Lines 1-3 Link Here

(-)www/wt/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1724754925	1	TIMESTAMP = 1728480049
2	SHA256 (emweb-wt-4.10.4_GH0.tar.gz) = dd6092abe599d9254242225e801da38085847b3147c1748e1212f274398a2e9a	2	SHA256 (emweb-wt-4.11.0_GH0.tar.gz) = b5f4a85559adaa0d89a78cec8a8ab7aa3f80c6d3a5ccd8ebe1134adf9aba3065
3	SIZE (emweb-wt-4.10.4_GH0.tar.gz) = 10449928	3	SIZE (emweb-wt-4.11.0_GH0.tar.gz) = 10563042

Lines 1-10 Link Here

(-)www/wt/files/patch-src_web_FileUtils.C (-10 lines)
1	--- src/web/FileUtils.C.orig 2024-03-06 10:25:31 UTC
2	+++ src/web/FileUtils.C
3	@@ -6,6 +6,7 @@
4
5	#include "web/FileUtils.h"
6
7	+#include <boost/filesystem/directory.hpp>
8	#include <boost/filesystem/operations.hpp>
9
10	#include "web/WebUtils.h"




--- test/auth/PasswordServiceTest.C.orig	2024-10-21 15:06:23 UTC
+++ test/auth/PasswordServiceTest.C
@@ -116,28 +116,3 @@ BOOST_AUTO_TEST_CASE( throttle_enabled_failure_test )
     BOOST_REQUIRE(f.myPasswordService_->delayForNextAttempt(user) == attemptResults[failures]);
   }
 }
-
-BOOST_AUTO_TEST_CASE( throttle_enabled_failure_with_last_attempt_offset_test )
-{
-  PasswordDboFixture f;
-  f.myPasswordService_->setPasswordThrottle(std::make_unique<Auth::AuthThrottle>());
-
-  Wt::Dbo::Transaction transaction(*f.session_);
-  Auth::User user = f.users_->registerNew();
-  transaction.commit();
-
-  std::vector<int> attemptResults { 0, 3, 7, 21, 20 };
-
-  // Test for 5 failure attempts
-  for (std::size_t failures = 0; failures < 5; ++failures) {
-    // Have one additional login failure
-    user.setAuthenticated(false);
-    transaction.commit();
-
-    // Sleep for x number of seconds, to test current datetime offset.
-    std::this_thread::sleep_for(std::chrono::seconds(failures + 1));
-
-    BOOST_REQUIRE(f.myPasswordService_->delayForNextAttempt(user) == attemptResults[failures]);
-  }
-}
-

Lines 11-16 Link Here

(-)www/wt/pkg-plist (+7 lines)
11	include/Wt/Auth/AbstractUserDatabase.h	11	include/Wt/Auth/AbstractUserDatabase.h
12	include/Wt/Auth/AuthModel.h	12	include/Wt/Auth/AuthModel.h
13	include/Wt/Auth/AuthService.h	13	include/Wt/Auth/AuthService.h
		14	include/Wt/Auth/AuthThrottle.h
14	include/Wt/Auth/AuthUtils.h	15	include/Wt/Auth/AuthUtils.h
15	include/Wt/Auth/AuthWidget.h	16	include/Wt/Auth/AuthWidget.h
16	%%DBO%%include/Wt/Auth/Dbo/AuthInfo.h	17	%%DBO%%include/Wt/Auth/Dbo/AuthInfo.h
Lines 23-28 Link Here
23	include/Wt/Auth/IssuedToken.h	24	include/Wt/Auth/IssuedToken.h
24	include/Wt/Auth/Login.h	25	include/Wt/Auth/Login.h
25	include/Wt/Auth/LostPasswordWidget.h	26	include/Wt/Auth/LostPasswordWidget.h
		27	include/Wt/Auth/Mfa/AbstractMfaProcess.h
		28	include/Wt/Auth/Mfa/Totp.h
		29	include/Wt/Auth/Mfa/TotpProcess.h
		30	include/Wt/Auth/Mfa/TotpQrCode.h
26	include/Wt/Auth/OAuthAuthorizationEndpointProcess.h	31	include/Wt/Auth/OAuthAuthorizationEndpointProcess.h
27	include/Wt/Auth/OAuthClient.h	32	include/Wt/Auth/OAuthClient.h
28	include/Wt/Auth/OAuthService.h	33	include/Wt/Auth/OAuthService.h
Lines 377-382 Link Here
377	include/Wt/WViewWidget.h	382	include/Wt/WViewWidget.h
378	include/Wt/WVirtualImage.h	383	include/Wt/WVirtualImage.h
379	include/Wt/WVmlImage.h	384	include/Wt/WVmlImage.h
		385	include/Wt/WWebSocketConnection.h
		386	include/Wt/WWebSocketResource.h
380	include/Wt/WWebWidget.h	387	include/Wt/WWebWidget.h
381	include/Wt/WWidget.h	388	include/Wt/WWidget.h
382	include/Wt/WWidgetItem.h	389	include/Wt/WWidgetItem.h

Return to bug 281959

Lines 1-6 Link Here

(-)www/wt/Makefile (-3 / +4 lines)
1	PORTNAME= wt	1	PORTNAME= wt
2	DISTVERSION= 4.10.4	2	DISTVERSION= 4.11.0
3	PORTREVISION= 1
4	CATEGORIES= www	3	CATEGORIES= www
5		4
6	MAINTAINER= info@babaei.net	5	MAINTAINER= info@babaei.net
Lines 10-18 Link Here
10	LICENSE= GPLv2	9	LICENSE= GPLv2
11	LICENSE_FILE= ${WRKSRC}/LICENSE	10	LICENSE_FILE= ${WRKSRC}/LICENSE
12		11
		12	RUN_DEPENDS= roboto-fonts-ttf>=0:x11-fonts/roboto-fonts-ttf
13	LIB_DEPENDS= libpng.so:graphics/png \	13	LIB_DEPENDS= libpng.so:graphics/png \
14	libboost_thread.so:devel/boost-libs \	14	libboost_thread.so:devel/boost-libs \
15	libGraphicsMagick.so:graphics/GraphicsMagick	15	libGraphicsMagick.so:graphics/GraphicsMagick
		16	TEST_RUN_DEPENDS= roboto-fonts-ttf>=0:x11-fonts/roboto-fonts-ttf
16		17
17	USES= cmake:testing compiler:c++14-lang cpe pkgconfig ssl	18	USES= cmake:testing compiler:c++14-lang cpe pkgconfig ssl
18	CPE_VENDOR= emweb	19	CPE_VENDOR= emweb
Lines 29-35 Link Here
29	-DWEBGROUP:STRING=${WWWGRP} \	30	-DWEBGROUP:STRING=${WWWGRP} \
30	-DWEBUSER:STRING=${WWWOWN} \	31	-DWEBUSER:STRING=${WWWOWN} \
31	-DWT_WRASTERIMAGE_IMPLEMENTATION:STRING=GraphicsMagick	32	-DWT_WRASTERIMAGE_IMPLEMENTATION:STRING=GraphicsMagick
32	CMAKE_OFF= BUILD_EXAMPLES BUILD_TESTS ENABLE_MYSQLSERVER \	33	CMAKE_OFF= BUILD_EXAMPLES ENABLE_MYSQLSERVER \
33	ENABLE_QT4 ENABLE_QT5 ENABLE_QT6	34	ENABLE_QT4 ENABLE_QT5 ENABLE_QT6
34	CMAKE_TESTING_ON= BUILD_TESTS	35	CMAKE_TESTING_ON= BUILD_TESTS
35		36

Line 0 Link Here

(-)www/wt/files/patch-test_auth_PasswordServiceTest.C (+31 lines)
	1	--- test/auth/PasswordServiceTest.C.orig 2024-10-21 15:06:23 UTC
	2	+++ test/auth/PasswordServiceTest.C
	3	@@ -116,28 +116,3 @@ BOOST_AUTO_TEST_CASE( throttle_enabled_failure_test )
	4	BOOST_REQUIRE(f.myPasswordService_->delayForNextAttempt(user) == attemptResults[failures]);
	5	}
	6	}
	7	-
	8	-BOOST_AUTO_TEST_CASE( throttle_enabled_failure_with_last_attempt_offset_test )
	9	-{
	10	- PasswordDboFixture f;
	11	- f.myPasswordService_->setPasswordThrottle(std::make_unique<Auth::AuthThrottle>());
	12	-
	13	- Wt::Dbo::Transaction transaction(*f.session_);
	14	- Auth::User user = f.users_->registerNew();
	15	- transaction.commit();
	16	-
	17	- std::vector<int> attemptResults { 0, 3, 7, 21, 20 };
	18	-
	19	- // Test for 5 failure attempts
	20	- for (std::size_t failures = 0; failures < 5; ++failures) {
	21	- // Have one additional login failure
	22	- user.setAuthenticated(false);
	23	- transaction.commit();
	24	-
	25	- // Sleep for x number of seconds, to test current datetime offset.
	26	- std::this_thread::sleep_for(std::chrono::seconds(failures + 1));
	27	-
	28	- BOOST_REQUIRE(f.myPasswordService_->delayForNextAttempt(user) == attemptResults[failures]);
	29	- }
	30	-}
	31	-