lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4932 Remove obsolete file

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

    • -1
    • +2
    /lams_central/web/profile/editprofile.jsp
LDEV-4932 Introduce CSRF Guard to Forum. Secure authoring.

    • -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
LDEV-4933 Take care about null/100.0 case

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

LDEV-4932 Extra comment in web.xml

LDEV-4932 Add source code for CSRF Guard

  1. … 41 more files in changeset.
LDEV-4933 Fix exception thrown on exporting lesson Excel from Gradebook

LDEV-4932 List actions to protect instead of checking everything

Merge branch 'master' into develop

LDEV-4933 Fix exception thrown on exporting lesson Excel from Gradebook

Merge branch 'develop' into LDEV-4745

# Conflicts:

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

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

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

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

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

# lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

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

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

# lams_learning/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties

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

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

# 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_laqa/conf/language/lams/ApplicationResources.properties

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

# lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

# lams_tool_laqa/web/learning/IndividualLearnerResults.jsp

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

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

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

# lams_tool_mindmap/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_nb/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_notebook/conf/language/lams/ApplicationResources_es_ES.properties

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

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

# lams_tool_pixlr/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

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

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_scribe/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_survey/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_task/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_vote/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_wiki/conf/language/lams/ApplicationResources_es_ES.properties

Revert "LDEV-4932 Initial integration of CSRF Guard"

This reverts commit c5a709e4cb42d0729ad3fbd814714fb27dd844df.

It should have been in a separate branch.

    • -34
    • +0
    /lams_build/lib/csrfguard/csrf.module.xml
    • -3
    • +1
    /lams_central/web/profile/editprofile.jsp
LDEV-4932 Initial integration of CSRF Guard

Add library and configuration file. Only Edit Profile form has a token

injected into form. Other POSTed forms will be stopped by the Guard,

with an error logged.

    • -0
    • +34
    /lams_build/lib/csrfguard/csrf.module.xml
    • binary
    /lams_build/lib/csrfguard/csrfguard-3.1.0-2019.12.19.jar
    • -0
    • +3
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -0
    • +70
    /lams_central/web/WEB-INF/tlds/security/csrfguard.tld
    • -1
    • +3
    /lams_central/web/profile/editprofile.jsp
LDEV-4932 Initial integration of CSRF Guard

Add library and configuration file. Only Edit Profile form has a token

injected into form. Other POSTed forms will be stopped by the Guard,

with an error logged.

    • -0
    • +34
    /lams_build/lib/csrfguard/csrf.module.xml
    • binary
    /lams_build/lib/csrfguard/csrfguard-3.1.0-2019.12.19.jar
    • -0
    • +3
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -0
    • +70
    /lams_central/web/WEB-INF/tlds/security/csrfguard.tld
    • -1
    • +3
    /lams_central/web/profile/editprofile.jsp
LDEV-4931 Adding ids to support Admin tests

    • -1
    • +1
    /lams_central/web/passwordChangeContent.jsp
    • -2
    • +2
    /lams_central/web/passwordChangeOkContent.jsp
    • -2
    • +2
    /lams_central/web/profile/editprofile.jsp
    • -1
    • +1
    /lams_central/web/profile/portrait.jsp
Merge branch 'master' into develop

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

  1. … 28 more files in changeset.
LDEV-4930 Avoid displaying excessive user parameters on edit profile jsp

    • -20
    • +6
    /lams_central/web/profile/editprofile.jsp
LDEV-4911 Added ids to support automated testing

    • -1
    • +1
    /lams_learning/web/gate/gateDescription.jsp
    • -2
    • +2
    /lams_monitoring/web/gate/gateInfo.jsp
LDEV-4929 Make calls to addExtUserToCourseAndLesson transactional

LDEV-4884 Store MCQ questions' UUIDs in JSON so Scratchie can use them

Merge branch 'master' into LDEV-4886

LDEV-4928 Update monitoring, TBL monitoring and Excel export to fully support VSA question type

LDEV-4921 Fix ordering for burning question in Scratchie learner

LDEV-4921 Properly detect General Burning Question in TBL monitor

LDEV-4922 Email results are generated for comment only rating activity

LDEV-4922 Email results are generated for comment only rating activity

LDEV-4922 Email results are generated for comment only rating activity

Merge branch 'master' into develop

# Conflicts:

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

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

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

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

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

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

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

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

# lams_tool_pixlr/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

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

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

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

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

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

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

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

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

  1. … 3 more files in changeset.