Fisheye on lams-github/lams_central/conf/security

lams-github (v4.8): LDEV-5420 Allow selecting which questions to print in QB

Marcin Cieslak — Thu, 04 Jan 2024 11:05:14 +0100

Marcin Cieslak committed 374bf62 on branch v4.8 in lams-github

LDEV-5420 Allow selecting which questions to print in QB

· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-1, +2)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/qb/PrintQbQuestionController.java	(-2, +16)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java	(-1, +4)	\| History	\| Source	\| Diff
· /lams_central/web/qb/collection.jsp	(-14, +20)	\| History	\| Source	\| Diff

lams-github (v4.7): Merge remote-tracking branch 'origin/v4.6' into v4.7...

Marcin Cieslak — Sat, 14 Jan 2023 18:59:56 +0100

Marcin Cieslak committed 6481b34 on branch v4.7, v4.8 in lams-github

Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-0, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5355 Allow comment editing in Peer Review tool

Marcin Cieslak — Wed, 11 Jan 2023 21:22:01 +0100

Marcin Cieslak committed a8e22ae on branch v4.7, v4.8 in lams-github

LDEV-5355 Allow comment editing in Peer Review tool

· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_preview/src/java/org/lamsfoundation/.../peerreview/web/controller/MonitoringController.java	(-0, +11)	\| History	\| Source	\| Diff
· /lams_tool_preview/web/pages/monitoring/criteriapart.jsp	(-4, +22)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5338 Rename paths to reflect grouping flow better

Marcin Cieslak — Mon, 14 Nov 2022 11:37:24 +0100

Marcin Cieslak committed b28b1e4 on branch v4.7, v4.8 in lams-github

LDEV-5338 Rename paths to reflect grouping flow better

· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/GroupingController.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_central/web/extGroups.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/main.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/orgGroup.js	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/orgGrouping.js	(-4, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java	(-10, +10)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java	(-5, +5)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5326, LDEV-5327 Secure requests to sysadmin clean up functions

Marcin Cieslak — Thu, 22 Sep 2022 11:09:46 +0200

Marcin Cieslak committed 5b9fbd9 on branch v4.7, v4.8 in lams-github

LDEV-5326, LDEV-5327 Secure requests to sysadmin clean up functions

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupController.java	(-2, +16)	\| History	\| Source	\| Diff
· /lams_admin/web/cleanup.jsp	(-1, +6)	\| History	\| Source	\| Diff
· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-1, +4)	\| History	\| Source	\| Diff

lams-github (): LDEV-5081 Merge changes made for monitor in LDEV-5083

Marcin Cieslak — Tue, 10 May 2022 17:45:37 +0200

Marcin Cieslak committed ecc49cd on branch in lams-github

LDEV-5081 Merge changes made for monitor in LDEV-5083

· /lams_build/3rdParty.userlibraries

(-23, +29)

| History

| Source

| Diff

· /lams_build/build.xml

(-7, +66)

| History

| Source

| Diff

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-3, +19)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

(-178, +129)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

(-7, +14)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java

(-9, +10)

| History

| Source

| Diff

· /lams_central/web/css/free.ui.jqgrid.custom.css

(-0, +29)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringActivity.js

(-177, +276)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringGeneral.js

(-163, +288)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringHandler.js

(-30, +51)

| History

| Source

| Diff

· /lams_common/db/sql/create_lams_11_tables.sql

(-1847, +1410)

| History

| Source

| Diff

· /lams_common/db/sql/insert_lams_config_data.sql

(-5, +3)

| History

| Source

| Diff

· /lams_common/db/sql/insert_types_data.sql

(-4, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql

(-0, +22)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java

(-15, +7)

| History

| Source

| Diff

… 22 more files in changeset.

lams-github (v4.7): LDEV-5304 Secure login page from CSRF attack...

Marcin Cieslak — Sun, 03 Apr 2022 08:59:11 +0200

Marcin Cieslak committed d0f91f1 on branch v4.7, v4.8 in lams-github

LDEV-5304 Secure login page from CSRF attack

Check for CSRF attack only for regular logins.

For LoginAs feature and integrations existing HTTP session gets

invalidated and so is the CSRF token.

· /lams_build/3rdParty.userlibraries	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-0, +2)	\| History	\| Source	\| Diff
· /lams_central/web/login.jsp	(-2, +4)	\| History	\| Source	\| Diff
· /lams_central/web/loginTwoFactorAuth.jsp	(-0, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java	(-2, +12)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5304 Update CSRF Guard to version 4.1.3

Marcin Cieslak — Sun, 03 Apr 2022 08:02:27 +0200

Marcin Cieslak committed 3582a26 on branch v4.7, v4.8 in lams-github

LDEV-5304 Update CSRF Guard to version 4.1.3

· /lams_build/lib/csrfguard/csrf.module.xml	(-1, +5)	\| History	\| Source	\| Diff
· /lams_build/lib/csrfguard/csrfguard-3.1.0-custom-2020.01.07.jar	(binary)	\| History	\| Source	\| Diff
· /lams_build/lib/csrfguard/csrfguard-4.1.3.jar	(binary)	\| History	\| Source
· /lams_build/lib/csrfguard/csrfguard-extension-session-4.1.3.jar	(binary)	\| History	\| Source
· /lams_build/lib/csrfguard/csrfguard-jsp-tags-4.1.3.jar	(binary)	\| History	\| Source
· /lams_build/liblist.txt	(-2, +1)	\| History	\| Source	\| Diff
· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-2, +6)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5185 Introduce time limits to Scratchie monitoring

Marcin Cieslak — Mon, 01 Mar 2021 19:36:34 +0100

Marcin Cieslak committed 804dca7 on branch v4.7, v4.8 in lams-github

LDEV-5185 Introduce time limits to Scratchie monitoring

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-0, +2)

| History

| Source

| Diff

· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties

(-0, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/monitoring/summary.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/conf/language/lams/ApplicationResources.properties

(-0, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/monitoring/summary.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

(-0, +20)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210301.sql

(-1, +1)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java

(-0, +5)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java

(-3, +3)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java

(-9, +1)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/lamsfoundation/.../tool/scratchie/service/ScratchieServiceImpl.java

(-18, +0)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/LearningController.java

(-7, +1)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/.../scratchie/web/controller/LearningWebsocketServer.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_scratchie/src/java/org/lamsfoundation/.../scratchie/web/controller/MonitoringController.java

(-0, +77)

| History

| Source

| Diff

· /lams_tool_scratchie/web/includes/css/scratchie-learning.scss

(-0, +12)

| History

| Source

| Diff

… 5 more files in changeset.

lams-github (v4.7): LDEV-5142 Introduce advanced time limits for Doku

Marcin Cieslak — Thu, 11 Feb 2021 13:33:28 +0100

Marcin Cieslak committed 0ebaba4 on branch v4.7, v4.8 in lams-github

LDEV-5142 Introduce advanced time limits for Doku

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-0, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/web/controller/AbstractTimeLimitWebsocketServer.java

(-0, +21)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/.../assessment/web/controller/LearningWebsocketServer.java

(-3, +8)

| History

| Source

| Diff

· /lams_tool_doku/conf/language/lams/ApplicationResources.properties

(-1, +19)

| History

| Source

| Diff

· /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties

(-1, +0)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/DokumaranUserDAO.java

(-2, +0)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/lamsfoundation/.../dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java

(-11, +0)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20210210.sql

(-0, +36)

| History

| Source

· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml

(-0, +3)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java

(-22, +29)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.java

(-38, +10)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

(-53, +38)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java

(-17, +9)

| History

| Source

| Diff

… 10 more files in changeset.

lams-github (v4.7): LDEV-5143 Allow changing leader in Dokumaran monitoring

Marcin Cieslak — Mon, 25 Jan 2021 22:29:58 +0100

Marcin Cieslak committed 8d372a4 on branch v4.7, v4.8 in lams-github

LDEV-5143 Allow changing leader in Dokumaran monitoring

· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_doku/conf/language/lams/ApplicationResources.properties	(-0, +3)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dto/SessionDTO.java	(-0, +18)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(-0, +36)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/.../tool/dokumaran/web/controller/MonitoringController.java	(-0, +10)	\| History	\| Source	\| Diff
· /lams_tool_doku/web/pages/learning/learning.jsp	(-0, +11)	\| History	\| Source	\| Diff
· /lams_tool_doku/web/pages/monitoring/summary.jsp	(-0, +40)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5143 Allow changing leader in Q&A, Submit Files and Vote monitoring

Marcin Cieslak — Mon, 25 Jan 2021 11:28:58 +0100

Marcin Cieslak committed f860043 on branch v4.7, v4.8 in lams-github

LDEV-5143 Allow changing leader in Q&A, Submit Files and Vote monitoring

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-1, +6)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/.../lams/tool/assessment/assessmentApplicationContext.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java

(-14, +19)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/monitoring/summary.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_laqa/conf/language/lams/ApplicationResources.properties

(-0, +3)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/GroupDTO.java

(-21, +20)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml

(-0, +2)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java

(-7, +4)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

(-0, +50)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/MonitoringController.java

(-1, +14)

| History

| Source

| Diff

· /lams_tool_laqa/web/learning/AnswersContent.jsp

(-0, +10)

| History

| Source

| Diff

· /lams_tool_laqa/web/learning/LearnerRep.jsp

(-0, +1)

| History

| Source

| Diff

· /lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

(-0, +32)

| History

| Source

| Diff

· /lams_tool_laqa/web/monitoring/SummaryContent.jsp

(-1, +9)

| History

| Source

| Diff

· /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

(-0, +3)

| History

| Source

| Diff

… 19 more files in changeset.

lams-github (v4.7): LDEV-5143 Extract TBL monitoring Change Leader feature...

Marcin Cieslak — Sun, 17 Jan 2021 16:33:17 +0100

Marcin Cieslak committed ec9b0ff on branch v4.7, v4.8 in lams-github

LDEV-5143 Extract TBL monitoring Change Leader feature

It will be used in other tools afterwards.

· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(-4, +9)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(-9, +28)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-1, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(-5, +11)	\| History	\| Source	\| Diff
· /lams_monitoring/web/tblmonitor/teams.jsp	(-84, +25)	\| History	\| Source	\| Diff
· /lams_tool_leader/conf/language/lams/ApplicationResources.properties	(-0, +4)	\| History	\| Source	\| Diff
· /lams_tool_leader/src/java/org/.../leaderselection/web/controller/MonitoringController.java	(-1, +90)	\| History	\| Source	\| Diff
· /lams_tool_leader/src/java/org/.../leaderselection/web/controller/TblMonitoringController.java	(-54, +0)	\| History	\| Source	\| Diff
· /lams_tool_leader/web/pages/monitoring/changeLeaderDialog.jsp	(-0, +78)	\| History	\| Source

lams-github (): Merge remote-tracking branch 'origin/v4.0' into v5.0...

Marcin Cieslak — Thu, 20 Aug 2020 08:46:11 +0200

Marcin Cieslak committed cf258ba on branch in lams-github

Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/questions/questionFile.jsp

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

· /lams_build/build.xml

(-3, +2)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties

(-1066, +1076)

| History

| Source

| Diff

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-2, +21)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

(-35, +111)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

(-4, +5)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

(-28, +30)

| History

| Source

| Diff

· /lams_central/web/qb/collection.jsp

(-1, +4)

| History

| Source

| Diff

· /lams_central/web/questions/questionFile.jsp

(-36, +110)

| History

| Source

| Diff

· /lams_common/db/sql/create_lams_11_tables.sql

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200219_updateTo40.sql

(-10, +53)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java

(-1, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java

(-2, +17)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

(-22, +58)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

(-8, +5)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java

(-16, +14)

| History

| Source

| Diff

… 11 more files in changeset.

lams-github (v4.7): LKC-215 Allow comment when sending question for reviewing

Marcin Cieslak — Thu, 16 Jul 2020 16:49:38 +0200

Marcin Cieslak committed 39fdd7c on branch v4.7, v4.8 in lams-github

LKC-215 Allow comment when sending question for reviewing

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-0, +1)

| History

| Source

| Diff

lams-github (v4.7): LKC-213 Add CSRF protection to Workflow Automation project

Marcin Cieslak — Fri, 03 Jul 2020 14:03:10 +0200

Marcin Cieslak committed 99d62c2 on branch v4.7, v4.8 in lams-github

LKC-213 Add CSRF protection to Workflow Automation project

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-2, +15)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5041 Add individual time limits

Marcin Cieslak — Thu, 18 Jun 2020 17:50:14 +0200

Marcin Cieslak committed 0336d51 on branch v4.7, v4.8 in lams-github

LDEV-5041 Add individual time limits

· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-2, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../assessment/dao/hibernate/AssessmentUserDAOHibernate.java	(-0, +22)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200617.sql	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.java	(-0, +11)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-1, +11)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/IAssessmentService.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../assessment/web/controller/LearningWebsocketServer.java	(-0, +16)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java	(-0, +49)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(-0, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/timeLimit.jsp	(-3, +59)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-0, +104)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5041 Control relative time limit in Assessment monitor

Marcin Cieslak — Wed, 17 Jun 2020 12:17:12 +0200

Marcin Cieslak committed ca3fa00 on branch v4.7, v4.8 in lams-github

LDEV-5041 Control relative time limit in Assessment monitor

· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(-1, +20)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/.../assessment/web/controller/LearningWebsocketServer.java	(-3, +5)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java	(-0, +14)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/learning/learning.jsp	(-134, +139)	\| History	\| Source	\| Diff
· /lams_tool_assessment/web/pages/monitoring/parts/timeLimit.jsp	(-0, +70)	\| History	\| Source
· /lams_tool_assessment/web/pages/monitoring/summary.jsp	(-1, +73)	\| History	\| Source	\| Diff

lams-github (v4.7): DEMO-5 Add Google SSO integration to CSRF Guard

Marcin Cieslak — Tue, 02 Jun 2020 11:01:13 +0200

Marcin Cieslak committed 26a325f on branch v4.7, v4.8 in lams-github

DEMO-5 Add Google SSO integration to CSRF Guard

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-0, +3)

| History

| Source

| Diff

lams-github (): Merge remote-tracking branch 'origin/v4.0' into v5.0...

Marcin Cieslak — Wed, 06 May 2020 13:21:23 +0200

Marcin Cieslak committed 8bc318f on branch in lams-github

Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

· /lams_build/3rdParty.userlibraries

(-0, +1)

| History

| Source

| Diff

· /lams_build/build.xml

(-1, +11)

| History

| Source

| Diff

· /lams_build/conf/j2ee/jboss-deployment-structure.xml

(-0, +1)

| History

| Source

| Diff

· /lams_build/liblist.txt

(-0, +2)

| History

| Source

| Diff

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-0, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

(-3, +4)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

(-3, +5)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200220.sql

(-0, +23)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200221.sql

(-0, +19)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java

(-0, +8)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java

(-0, +9)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

(-62, +74)

| History

| Source

| Diff

· /lams_monitoring/web/tblmonitor/teams.jsp

(-440, +440)

| History

| Source

| Diff

· /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

(-0, +2)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

(-18, +22)

| History

| Source

| Diff

… 16 more files in changeset.

lams-github (v4.7): LDEV-4999 Allow marks update in Dokuy monitoring summary page

Marcin Cieslak — Mon, 20 Apr 2020 12:55:34 +0200

Marcin Cieslak committed 0558068 on branch v4.7, v4.8 in lams-github

LDEV-4999 Allow marks update in Dokuy monitoring summary page

· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/jquery.tablesorter-editable.js	(-0, +4)	\| History	\| Source
· /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_doku/src/java/org/lamsfoundation/.../tool/dokumaran/web/controller/MonitoringController.java	(-1, +46)	\| History	\| Source	\| Diff
· /lams_tool_doku/web/pages/monitoring/summary.jsp	(-13, +68)	\| History	\| Source	\| Diff

lams-github (v4.7): Merge remote-tracking branch 'origin/master' into v4.0...

Marcin Cieslak — Fri, 20 Mar 2020 06:35:02 +0100

Marcin Cieslak committed a61b6ad on branch v4.7, v4.8 in lams-github

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

· /lams_central/conf/language/lams/ApplicationResources.properties

(-0, +2)

| History

| Source

| Diff

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-0, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

(-1664, +1673)

| History

| Source

| Diff

· /lams_central/web/authoring/authoring.jsp

(-2, +11)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringActivity.js

(-1, +4)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringGeneral.js

(-3, +7)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringProperty.js

(-3, +14)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java

(-1, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java

(-3, +6)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java

(-20, +18)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java

(-0, +8)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java

(-1, +2)

| History

| Source

| Diff

· /lams_learning/conf/language/lams/ApplicationResources.properties

(-0, +3)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerFullService.java

(-1, +3)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

(-62, +74)

| History

| Source

| Diff

… 7 more files in changeset.

lams-github (v4.7): LDEV-4989 Password Gate initial implementation

Marcin Cieslak — Mon, 16 Mar 2020 15:44:27 +0100

Marcin Cieslak committed 7116e79 on branch v4.7, v4.8 in lams-github

LDEV-4989 Password Gate initial implementation

· /lams_central/conf/language/lams/ApplicationResources.properties

(-0, +2)

| History

| Source

| Diff

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-0, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

(-1661, +1670)

| History

| Source

| Diff

· /lams_central/web/authoring/authoring.jsp

(-2, +11)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringActivity.js

(-1, +4)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringGeneral.js

(-3, +7)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/authoring/authoringProperty.js

(-3, +14)

| History

| Source

| Diff

· /lams_common/conf/language/lams/ApplicationResources.properties

(-0, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200315.sql

(-0, +21)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java

(-1, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java

(-6, +16)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/PasswordGateActivity.java

(-0, +110)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java

(-3, +6)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java

(-20, +18)

| History

| Source

| Diff

… 22 more files in changeset.

lams-github (): Merge branch 'LDEV-4979' into LDEV-4951...

Andrey Balan — Fri, 21 Feb 2020 17:41:06 +0100

Andrey Balan committed 8df2f2f on branch in lams-github

Merge branch 'LDEV-4979' into LDEV-4951

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

# lams_tool_lamc/build.properties

# lams_tool_lamc/db/sql/create_lams_tool_mc.sql

# lams_tool_lamc/db/sql/tool_insert.sql

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java

# lams_tool_lamc/web/403.jsp

# lams_tool_lamc/web/404.jsp

# lams_tool_lamc/web/WEB-INF/web.xml

# lams_tool_lamc/web/common/taglibs.jsp

# lams_tool_lamc/web/error.jsp

# lams_tool_lamc/web/login.jsp

· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-1, +6)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java	(-4, +6)	\| History	\| Source	\| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(-3, +4)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/AssessmentServiceImpl.java	(-136, +114)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../tool/assessment/service/IAssessmentService.java	(-5, +4)	\| History	\| Source	\| Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/.../assessment/web/controller/MonitoringController.java	(-5, +2)	\| History	\| Source	\| Diff
· /lams_tool_lamc/build.properties	(-1, +1)	\| History	\| Source	\| Diff

lams-github (): LDEV-4951 Remove traces of MCQ tool from other modules

Andrey Balan — Tue, 18 Feb 2020 15:21:12 +0100

Andrey Balan committed b5d2a68 on branch in lams-github

LDEV-4951 Remove traces of MCQ tool from other modules

· /lams_build/build.xml

(-4, +2)

| History

| Source

| Diff

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-6, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

(-32, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

(-6, +5)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

(-3, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java

(-1, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java

(-3, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

(-12, +8)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

(-1, +0)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

(-2, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

(-3, +1)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java

(-9, +7)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java

(-16, +8)

| History

| Source

| Diff

· /lams_monitoring/web/tblmonitor/tblmonitor.jsp

(-13, +2)

| History

| Source

| Diff

… 178 more files in changeset.

lams-github (v4.7): LDEV-4932 Add CSRF to password change

Andrey Balan — Wed, 12 Feb 2020 14:21:09 +0100

Andrey Balan committed df52e28 on branch v4.7, v4.8 in lams-github

LDEV-4932 Add CSRF to password change

· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/web/passwordChangeContent.jsp	(-39, +44)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4932 Add CSRF to password change...

Andrey Balan — Wed, 12 Feb 2020 14:21:09 +0100

Andrey Balan committed 52aa963 on branch v4.7, v4.8 in lams-github

LDEV-4932 Add CSRF to password change

(cherry picked from commit df52e287d4a5f815849470ffb1fd82a3867a6bdb)

· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/web/passwordChangeContent.jsp	(-39, +44)	\| History	\| Source	\| Diff

lams-github (v4.7): Merge branch 'master' into v4.0

Andrey Balan — Fri, 07 Feb 2020 22:18:29 +0100

Andrey Balan committed 563a06e on branch v4.7, v4.8 in lams-github

Merge branch 'master' into v4.0

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-1, +0)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4932 No need to protect /admin/user/remove.do, as it simply shows another jsp page

Andrey Balan — Fri, 07 Feb 2020 22:17:24 +0100

Andrey Balan committed ead5d98 on branch v4.7, v4.8 in lams-github

LDEV-4932 No need to protect /admin/user/remove.do, as it simply shows another jsp page

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_admin/web/remove.jsp	(-2, +8)	\| History	\| Source	\| Diff
· /lams_admin/web/userlist.jsp	(-13, +12)	\| History	\| Source	\| Diff
· /lams_central/conf/security/Owasp.CsrfGuard.properties	(-1, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): Merge branch 'master' into v4.0

Andrey Balan — Thu, 23 Jan 2020 19:42:11 +0100

Andrey Balan committed 3ef413f on branch v4.7, v4.8 in lams-github

Merge branch 'master' into v4.0

· /lams_central/conf/security/Owasp.CsrfGuard.properties

(-0, +5)

| History

| Source

| Diff