Clone
Tools

 

marcincieslak <mgr.inz.marcin.cieslak@gmail.com> in lams-github

About

3,231 commits
  • Mapped user: Marcin Cieslak
  • First commit: 03 July 2008
  • Last commit: 03 January 2020
Last Week All Time
Commits: 0 3,231

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 
Friday 03 Jan 2020
6:44 pm

Marcin Cieslak

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

Options
6:44 pm

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

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

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

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

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# 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_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

Options
    • -14
    • +25
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
    • -91
    • +176
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -30
    • +111
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
    • -5
    • +10
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java
    • -41
    • +81
    /lams_central/web/addLesson.jsp
    • -1
    • +5
    /lams_central/web/authoring/authoring.jsp
    • -13
    • +28
    /lams_central/web/includes/javascript/addLesson.js
    • -0
    • +58
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringMenu.js
    • -12
    • +21
    /lams_central/web/qb/search.jsp
    • -5
    • +69
    /lams_central/web/qb/stats.jsp
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
    • -20
    • +33
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
  16. … 5 more files in changeset.
6:24 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
2:59 pm

Marcin Cieslak

LDEV-4743 Squash tool patches updating to version 3.1

Options
    • -19
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170315.sql
    • -16
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170822.sql
    • -34
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
    • -23
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -17
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171218.sql
    • -18
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180330.sql
    • -26
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180425.sql
    • -14
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180515.sql
    • -14
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190103.sql
    • -0
    • +117
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190103_updateTo31.sql
    • -23
    • +0
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20180801.sql
    • -14
    • +0
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20190103.sql
    • -0
    • +28
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20190103_updateTo31.sql
    • -17
    • +0
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20180425.sql
    • -14
    • +0
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20190103.sql
  16. … 104 more files in changeset.
2:29 pm

Marcin Cieslak

LDEV-4743 Squash core patches updating to version 3.1

Options
    • -16
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170209.sql
    • -14
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170308.sql
    • -16
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170309.sql
    • -14
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170310.sql
    • -38
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170323.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170410.sql
    • -16
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170411.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170508.sql
    • -76
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170512.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170628.sql
    • -50
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170710.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170720.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170814.sql
    • -22
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170908.sql
    • -15
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170926.sql
  16. … 38 more files in changeset.
2:11 pm

Marcin Cieslak

Merge tag 'v3.0'

Freeze 3.0 version

Options
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030200_updateTo232.sql
1:40 pm

Marcin Cieslak

LDEV-4743 Squash core patches updating to version 3.0

Options
    • -22
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040007.sql
    • -18
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040008.sql
    • -74
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040009.sql
    • -10
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040010.sql
    • -10
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040011.sql
    • -10
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040012.sql
    • -25
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040013.sql
    • -30
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040014.sql
    • -12
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040015.sql
    • -12
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040016.sql
    • -13
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040017.sql
    • -12
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040018.sql
    • -14
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040019.sql
    • -19
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040020.sql
    • -38
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040021.sql
  16. … 64 more files in changeset.
1:20 pm

Marcin Cieslak

LDEV-4743 Squash patches updating to version 2.4

Options
    • -43
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040000.sql
    • -14
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040002.sql
    • -18
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040004.sql
    • -128
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006.sql
    • -0
    • +320
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040006_updateTo24.sql
1:19 pm

Marcin Cieslak

LDEV-4743 Rename patch to keep naming convention

Options
    • -12
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030200_update232_version.sql
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030200_updateTo232.sql
Tuesday 31 Dec 2019
12:34 am

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

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

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

Options
    • -10
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -11
    • +20
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
12:28 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
12:07 am

Marcin Cieslak

Merge branch 'LDEV-4936'

Options
12:06 am

Marcin Cieslak

LDEV-4936 Fix layout for tool groups in sysadmin

Options
    • -5
    • +0
    /lams_admin/web/css/learningLibraryGroup.scss
    • -5
    • +2
    /lams_admin/web/includes/javascript/learningLibraryGroup.js
    • -0
    • +5
    /lams_admin/web/toolcontent/learningLibraryGroup.jsp
    • -34
    • +14
    /lams_admin/web/toolcontent/toolcontentlist.jsp
Saturday 28 Dec 2019
11:44 pm

Marcin Cieslak

Merge branch 'LDEV-4935'

Options
11:42 pm

Marcin Cieslak

LDEV-4935 Secure Scribe websockets

User gets checked if he participates in the given activity.

Options
    • -4
    • +11
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/controller/LearningWebsocketServer.java
11:42 pm

Marcin Cieslak

LDEV-4935 Secure Mindmap websockets

User gets checked if he participates in the given activity.

Options
    • -1
    • +2
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/IMindmapService.java
    • -16
    • +24
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java
    • -3
    • +10
    /lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningWebsocketServer.java
11:42 pm

Marcin Cieslak

LDEV-4935 Secure Scratchie websockets

User gets checked if he participates in the given activity.

Options
    • -3
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/DAO.java
    • -25
    • +26
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -19
    • +26
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
11:27 pm

Marcin Cieslak

LDEV-4935 Secure Leader Selection websockets

User gets checked if he participates in the given activity.

Options
    • -9
    • +6
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java
    • -7
    • +14
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java
    • -3
    • +11
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningWebsocketServer.java
11:18 pm

Marcin Cieslak

LDEV-4935 Secure Dokumaran websockets

User gets checked if he participates in the given activity.

Options
    • -4
    • +5
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/DAO.java
    • -2
    • +10
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -28
    • +33
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -3
    • +11
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java
11:03 pm

Marcin Cieslak

LDEV-4935 Secure Chat (tool) websockets

User gets checked if he participates in the given activity.

Options
    • -4
    • +10
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/controller/LearningWebsocketServer.java
10:54 pm

Marcin Cieslak

LDEV-4935 Secure lesson chat (presence) websockets

Nickname is taken from session, not from incoming parameters. User gets

checked if he participates in the given lesson.

Simplified code, clean up.

Options
    • -69
    • +104
    /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
    • -3
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/dao/IPresenceChatDAO.java
    • -5
    • +1
    /lams_learning/web/includes/javascript/presence.js
    • -2
    • +1
    /lams_learning/web/presenceChat.jsp
Monday 23 Dec 2019
7:43 pm

Marcin Cieslak

LDEV-4932 Remove obsolete form input

Options
    • -1
    • +0
    /lams_central/web/profile/editprofile.jsp
Friday 20 Dec 2019
10:58 pm

Marcin Cieslak

LDEV-4932 Remove obsolete file

Options
    • -70
    • +0
    /lams_tool_forum/web/WEB-INF/security/csrfguard.tld
10:57 pm

Marcin Cieslak

LDEV-4932 Use same approach to token injection in all forms

Options
    • -1
    • +2
    /lams_central/web/profile/editprofile.jsp
10:53 pm

Marcin Cieslak

LDEV-4932 Introduce CSRF Guard to Forum. Secure authoring.

Options
    • -0
    • +1
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -6
    • +6
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java
    • -0
    • +70
    /lams_tool_forum/web/WEB-INF/tlds/security/csrfguard.tld
    • -5
    • +20
    /lams_tool_forum/web/WEB-INF/web.xml
    • -1
    • +2
    /lams_tool_forum/web/common/taglibs.jsp
    • -2
    • +2
    /lams_tool_forum/web/jsps/authoring/authoring.jsp
9:20 pm

Marcin Cieslak

LDEV-4932 CSRF Guard configuration is needed only in one place

Options
    • -7
    • +0
    /lams_build/build_base.xml
    • -2
    • +4
    /lams_central/conf/security/Owasp.CsrfGuard.properties
8:58 pm

Marcin Cieslak

LDEV-4932 Extra comment in web.xml

Options
    • -1
    • +3
    /lams_central/web/WEB-INF/web.xml
8:57 pm

Marcin Cieslak

LDEV-4932 Add source code for CSRF Guard

Options
    • -0
    • +813
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/CsrfGuard.java
    • -0
    • +47
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/CsrfGuardException.java
    • -0
    • +100
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/CsrfGuardFilter.java
    • -0
    • +29
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/CsrfGuardHttpSessionListener.java
    • -0
    • +148
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/CsrfGuardServletContextListener.java
    • -0
    • +72
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/action/AbstractAction.java
    • -0
    • +46
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/action/Empty.java
    • -0
    • +55
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/action/Error.java
    • -0
    • +57
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/action/Forward.java
    • -0
    • +52
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/action/IAction.java
    • -0
    • +48
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/action/Invalidate.java
    • -0
    • +85
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/action/Log.java
    • -0
    • +54
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/action/Redirect.java
    • -0
    • +48
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/action/RequestAttribute.java
    • -0
    • +95
    /3rdParty_sources/csrfguard/org/owasp/csrfguard/action/Rotate.java
  16. … 41 more files in changeset.
8:38 pm

Marcin Cieslak

LDEV-4932 List actions to protect instead of checking everything

Options
    • -1
    • +9
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -1
    • +1
    /lams_central/web/WEB-INF/web.xml
Thursday 19 Dec 2019
11:01 pm

Marcin Cieslak

Revert "LDEV-4932 Initial integration of CSRF Guard"

This reverts commit c5a709e4cb42d0729ad3fbd814714fb27dd844df.

It should have been in a separate branch.

Options
    • -8
    • +0
    /lams_build/build.xml
    • -7
    • +0
    /lams_build/build_base.xml
    • -1
    • +0
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • -34
    • +0
    /lams_build/lib/csrfguard/csrf.module.xml
    • binary
    /lams_build/lib/csrfguard/csrfguard-3.1.0-2019.12.19.jar
    • -7
    • +0
    /lams_central/build.xml
    • -3
    • +0
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -70
    • +0
    /lams_central/web/WEB-INF/tlds/security/csrfguard.tld
    • -33
    • +1
    /lams_central/web/WEB-INF/web.xml
    • -3
    • +1
    /lams_central/web/profile/editprofile.jsp