From 747319aab522f5e487faaed6ae9d01ad65c6a35e Mon Sep 17 00:00:00 2001 From: "rogan.dawes" Date: Tue, 10 Jul 2007 11:48:02 +0000 Subject: [PATCH] Move definition of standard Categories to Category class Also update all the referring classes git-svn-id: http://webgoat.googlecode.com/svn/trunk@129 4033779f-a91e-0410-96ef-6bf7bf53c507 --- .../owasp/webgoat/lessons/AbstractLesson.java | 113 +++--------------- .../webgoat/lessons/AccessControlMatrix.java | 2 +- .../org/owasp/webgoat/lessons/BackDoors.java | 2 +- .../webgoat/lessons/BasicAuthentication.java | 2 +- .../webgoat/lessons/BlindSqlInjection.java | 2 +- .../owasp/webgoat/lessons/BufferOverflow.java | 2 +- .../org/owasp/webgoat/lessons/CSRF.java | 2 +- .../org/owasp/webgoat/lessons/Category.java | 51 +++++++- .../webgoat/lessons/Challenge2Screen.java | 2 +- .../webgoat/lessons/CommandInjection.java | 2 +- .../CrossSiteScripting.java | 3 +- .../owasp/webgoat/lessons/DOMInjection.java | 2 +- .../org/owasp/webgoat/lessons/DOS_Login.java | 2 +- .../org/owasp/webgoat/lessons/Encoding.java | 2 +- .../lessons/FailOpenAuthentication.java | 2 +- .../owasp/webgoat/lessons/ForcedBrowsing.java | 2 +- .../owasp/webgoat/lessons/ForgotPassword.java | 2 +- .../webgoat/lessons/HiddenFieldTampering.java | 2 +- .../org/owasp/webgoat/lessons/HtmlClues.java | 2 +- .../org/owasp/webgoat/lessons/HttpBasics.java | 2 +- .../org/owasp/webgoat/lessons/HttpOnly.java | 2 +- .../owasp/webgoat/lessons/HttpSplitting.java | 2 +- .../owasp/webgoat/lessons/JSONInjection.java | 2 +- .../webgoat/lessons/JavaScriptValidation.java | 2 +- .../owasp/webgoat/lessons/LessonAdapter.java | 2 +- .../owasp/webgoat/lessons/LogSpoofing.java | 2 +- .../org/owasp/webgoat/lessons/NewLesson.java | 2 +- .../lessons/PathBasedAccessControl.java | 2 +- .../org/owasp/webgoat/lessons/Phishing.java | 2 +- .../owasp/webgoat/lessons/ReflectedXSS.java | 2 +- .../webgoat/lessons/RemoteAdminFlaw.java | 2 +- .../RoleBasedAccessControl.java | 3 +- .../lessons/SQLInjection/SQLInjection.java | 3 +- .../webgoat/lessons/SilentTransactions.java | 2 +- .../owasp/webgoat/lessons/SoapRequest.java | 2 +- .../webgoat/lessons/SqlNumericInjection.java | 2 +- .../webgoat/lessons/SqlStringInjection.java | 2 +- .../org/owasp/webgoat/lessons/StoredXss.java | 2 +- .../webgoat/lessons/ThreadSafetyProblem.java | 2 +- .../org/owasp/webgoat/lessons/TraceXSS.java | 2 +- .../owasp/webgoat/lessons/UncheckedEmail.java | 2 +- .../owasp/webgoat/lessons/WSDLScanning.java | 2 +- .../lessons/WeakAuthenticationCookie.java | 2 +- .../owasp/webgoat/lessons/WeakSessionID.java | 2 +- .../owasp/webgoat/lessons/WsSAXInjection.java | 2 +- .../owasp/webgoat/lessons/WsSqlInjection.java | 2 +- .../owasp/webgoat/lessons/XMLInjection.java | 2 +- .../owasp/webgoat/lessons/XPATHInjection.java | 2 +- .../lessons/admin/ProductsAdminScreen.java | 2 +- .../lessons/admin/RefreshDBScreen.java | 2 +- .../lessons/admin/ReportCardScreen.java | 2 +- .../admin/SummaryReportCardScreen.java | 2 +- .../lessons/admin/UserAdminScreen.java | 2 +- .../webgoat/lessons/admin/ViewDatabase.java | 2 +- .../org/owasp/webgoat/session/WebSession.java | 2 +- 55 files changed, 118 insertions(+), 155 deletions(-) diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java index 737e02d03..739242beb 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AbstractLesson.java @@ -73,87 +73,6 @@ import org.owasp.webgoat.session.WebgoatProperties; public abstract class AbstractLesson extends Screen implements Comparable { - /** - * Description of the Field - */ - public final static Category A1 = new Category("Unvalidated Parameters", - new Integer(110)); - - /** - * Description of the Field - */ - public final static Category A10 = new Category( - "Insecure Configuration Management", new Integer(1010)); - - /** - * Description of the Field - */ - public final static Category A2 = new Category("Broken Access Control", - new Integer(210)); - - /** - * Description of the Field - */ - public final static Category A3 = new Category( - "Broken Authentication and Session Management", new Integer(310)); - - /** - * Description of the Field - */ - public final static Category A4 = new Category( - "Cross-Site Scripting (XSS)", new Integer(410)); - - /** - * Description of the Field - */ - public final static Category A5 = new Category("Buffer Overflows", - new Integer(510)); - - /** - * Description of the Field - */ - public final static Category A6 = new Category("Injection Flaws", - new Integer(610)); - - /** - * Description of the Field - */ - public final static Category A7 = new Category("Improper Error Handling", - new Integer(710)); - - /** - * Description of the Field - */ - public final static Category A8 = new Category("Insecure Storage", - new Integer(810)); - - /** - * Description of the Field - */ - public final static Category A9 = new Category("Denial of Service", - new Integer(910)); - - /** - * Description of the Field - */ - public final static Category WEB_SERVICES = new Category("Web Services", - new Integer(1110)); - - public final static Category AJAX_SECURITY = new Category("AJAX Security", - new Integer(1150)); - - public final static Category ADMIN_FUNCTIONS = new Category( - "Admin Functions", new Integer(10)); - - public final static Category GENERAL = new Category("General", new Integer( - 50)); - - public final static Category CODE_QUALITY = new Category("Code Quality", - new Integer(70)); - - public final static Category CHALLENGE = new Category("Challenge", - new Integer(2000)); - /** * Description of the Field */ @@ -198,22 +117,22 @@ public abstract class AbstractLesson extends Screen implements Comparable */ public AbstractLesson() { - categories.add(A1); - categories.add(A2); - categories.add(A3); - categories.add(A4); - categories.add(A5); - categories.add(A6); - categories.add(A7); - categories.add(A8); - categories.add(A9); - categories.add(A10); - categories.add(WEB_SERVICES); - categories.add(AJAX_SECURITY); - categories.add(ADMIN_FUNCTIONS); - categories.add(GENERAL); - categories.add(CODE_QUALITY); - categories.add(CHALLENGE); + categories.add(Category.A1); + categories.add(Category.A2); + categories.add(Category.A3); + categories.add(Category.A4); + categories.add(Category.A5); + categories.add(Category.A6); + categories.add(Category.A7); + categories.add(Category.A8); + categories.add(Category.A9); + categories.add(Category.A10); + categories.add(Category.WEB_SERVICES); + categories.add(Category.AJAX_SECURITY); + categories.add(Category.ADMIN_FUNCTIONS); + categories.add(Category.GENERAL); + categories.add(Category.CODE_QUALITY); + categories.add(Category.CHALLENGE); id = new Integer(++count); } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AccessControlMatrix.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AccessControlMatrix.java index 770399108..28f96c054 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AccessControlMatrix.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/AccessControlMatrix.java @@ -126,7 +126,7 @@ public class AccessControlMatrix extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.A2; + return Category.A2; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java index a7c3e8aa4..3714f0664 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java @@ -279,7 +279,7 @@ public class BackDoors extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.A6; + return Category.A6; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BasicAuthentication.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BasicAuthentication.java index 7a229921f..b66456ede 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BasicAuthentication.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BasicAuthentication.java @@ -263,7 +263,7 @@ public class BasicAuthentication extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.A3; + return Category.A3; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BlindSqlInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BlindSqlInjection.java index 9aaa676d5..1194ab46e 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BlindSqlInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BlindSqlInjection.java @@ -156,7 +156,7 @@ public class BlindSqlInjection extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A6; + return Category.A6; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BufferOverflow.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BufferOverflow.java index f2a19f7dd..4ce80a660 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BufferOverflow.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BufferOverflow.java @@ -64,7 +64,7 @@ public class BufferOverflow extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.A5; + return Category.A5; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java index 371f6a742..fd43c79cb 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java @@ -280,7 +280,7 @@ public class CSRF extends LessonAdapter { @Override protected Category getDefaultCategory() { - return AbstractLesson.A2; + return Category.A2; } private final static Integer DEFAULT_RANKING = new Integer(120); diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Category.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Category.java index a414b9e3d..3d8e9b8a0 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Category.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Category.java @@ -35,6 +35,54 @@ package org.owasp.webgoat.lessons; public class Category implements Comparable { + public final static Category A1 = new Category("Unvalidated Parameters", + new Integer(110)); + + public final static Category A2 = new Category("Broken Access Control", + new Integer(210)); + + public final static Category A3 = new Category( + "Broken Authentication and Session Management", new Integer(310)); + + public final static Category A4 = new Category( + "Cross-Site Scripting (XSS)", new Integer(410)); + + public final static Category A5 = new Category("Buffer Overflows", + new Integer(510)); + + public final static Category A6 = new Category("Injection Flaws", + new Integer(610)); + + public final static Category A7 = new Category("Improper Error Handling", + new Integer(710)); + + public final static Category A8 = new Category("Insecure Storage", + new Integer(810)); + + public final static Category A9 = new Category("Denial of Service", + new Integer(910)); + + public final static Category A10 = new Category( + "Insecure Configuration Management", new Integer(1010)); + + public final static Category WEB_SERVICES = new Category("Web Services", + new Integer(1110)); + + public final static Category AJAX_SECURITY = new Category("AJAX Security", + new Integer(1150)); + + public final static Category ADMIN_FUNCTIONS = new Category( + "Admin Functions", new Integer(10)); + + public final static Category GENERAL = new Category("General", new Integer( + 50)); + + public final static Category CODE_QUALITY = new Category("Code Quality", + new Integer(70)); + + public final static Category CHALLENGE = new Category("Challenge", + new Integer(2000)); + private String category; private Integer ranking; @@ -46,7 +94,6 @@ public class Category implements Comparable this.ranking = ranking; } - public int compareTo(Object obj) { int value = 1; @@ -80,7 +127,7 @@ public class Category implements Comparable public boolean equals(Object obj) { - return getName().equals(((Category) obj).getName()); + return (obj instanceof Category) && getName().equals(((Category) obj).getName()); } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Challenge2Screen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Challenge2Screen.java index 0d4e24813..b5b098098 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Challenge2Screen.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Challenge2Screen.java @@ -445,7 +445,7 @@ public class Challenge2Screen extends LessonAdapter protected Category getDefaultCategory() { - return CHALLENGE; + return Category.CHALLENGE; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CommandInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CommandInjection.java index c4506dd88..45e406024 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CommandInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CommandInjection.java @@ -324,7 +324,7 @@ public class CommandInjection extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A6; + return Category.A6; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java index 295245b73..4f030819a 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CrossSiteScripting/CrossSiteScripting.java @@ -11,7 +11,6 @@ import org.apache.ecs.Element; import org.apache.ecs.ElementContainer; import org.apache.ecs.html.IMG; import org.apache.ecs.html.A; -import org.owasp.webgoat.lessons.AbstractLesson; import org.owasp.webgoat.lessons.Category; import org.owasp.webgoat.lessons.LessonAdapter; import org.owasp.webgoat.lessons.LessonAction; @@ -199,7 +198,7 @@ public class CrossSiteScripting extends LessonAdapter */ public Category getDefaultCategory() { - return AbstractLesson.A4; + return Category.A4; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOMInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOMInjection.java index 92dfca62d..08d178014 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOMInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOMInjection.java @@ -162,7 +162,7 @@ public class DOMInjection extends LessonAdapter protected Category getDefaultCategory() { - return AJAX_SECURITY; + return Category.AJAX_SECURITY; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOS_Login.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOS_Login.java index 98f96bae8..04d7c0f3f 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOS_Login.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOS_Login.java @@ -190,7 +190,7 @@ public class DOS_Login extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A9; + return Category.A9; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Encoding.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Encoding.java index bef70a8b8..29d0c2e25 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Encoding.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Encoding.java @@ -565,7 +565,7 @@ public class Encoding extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.A8; + return Category.A8; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/FailOpenAuthentication.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/FailOpenAuthentication.java index 2866bd42d..df23d6001 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/FailOpenAuthentication.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/FailOpenAuthentication.java @@ -133,7 +133,7 @@ public class FailOpenAuthentication extends WeakAuthenticationCookie */ public Category getDefaultCategory() { - return AbstractLesson.A7; + return Category.A7; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java index 02f42033a..f2af9732b 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java @@ -107,7 +107,7 @@ public class ForcedBrowsing extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A10; + return Category.A10; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForgotPassword.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForgotPassword.java index 544b72bae..ef03c1c27 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForgotPassword.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForgotPassword.java @@ -290,7 +290,7 @@ public class ForgotPassword extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.A3; + return Category.A3; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HiddenFieldTampering.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HiddenFieldTampering.java index f6e607b30..2575ec8ee 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HiddenFieldTampering.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HiddenFieldTampering.java @@ -176,7 +176,7 @@ public class HiddenFieldTampering extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A1; + return Category.A1; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HtmlClues.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HtmlClues.java index a83fa6887..a0356ce76 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HtmlClues.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HtmlClues.java @@ -239,7 +239,7 @@ public class HtmlClues extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.CODE_QUALITY; + return Category.CODE_QUALITY; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpBasics.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpBasics.java index 33327738b..ec4063cf9 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpBasics.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpBasics.java @@ -119,7 +119,7 @@ public class HttpBasics extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.GENERAL; + return Category.GENERAL; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpOnly.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpOnly.java index d08a1061f..7392e6df1 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpOnly.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpOnly.java @@ -149,7 +149,7 @@ public class HttpOnly extends LessonAdapter { */ protected Category getDefaultCategory() { - return AbstractLesson.A4; + return Category.A4; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpSplitting.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpSplitting.java index fdc604a8a..411256568 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpSplitting.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpSplitting.java @@ -242,7 +242,7 @@ public class HttpSplitting extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.GENERAL; + return Category.GENERAL; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JSONInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JSONInjection.java index 73a2906b2..755e28380 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JSONInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JSONInjection.java @@ -280,7 +280,7 @@ public class JSONInjection extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.AJAX_SECURITY; + return Category.AJAX_SECURITY; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JavaScriptValidation.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JavaScriptValidation.java index f20c14683..13d01d421 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JavaScriptValidation.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JavaScriptValidation.java @@ -270,7 +270,7 @@ public class JavaScriptValidation extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A1; + return Category.A1; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java index 1a1226a39..385e2043f 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java @@ -200,7 +200,7 @@ public abstract class LessonAdapter extends AbstractLesson */ protected Category getDefaultCategory() { - return GENERAL; + return Category.GENERAL; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LogSpoofing.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LogSpoofing.java index 93eaf9708..91b70fd6b 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LogSpoofing.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LogSpoofing.java @@ -163,7 +163,7 @@ public class LogSpoofing extends LessonAdapter @Override protected Category getDefaultCategory() { - return AbstractLesson.A6; + return Category.A6; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java index 11a34c44c..a8d002f5b 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java @@ -60,7 +60,7 @@ public class NewLesson extends LessonAdapter */ protected Category getDefaultCategory() { - return GENERAL; + return Category.GENERAL; } private final static Integer DEFAULT_RANKING = new Integer(85); diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/PathBasedAccessControl.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/PathBasedAccessControl.java index c3630adbc..0f06543cb 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/PathBasedAccessControl.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/PathBasedAccessControl.java @@ -241,7 +241,7 @@ public class PathBasedAccessControl extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A2; + return Category.A2; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Phishing.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Phishing.java index 5077ddd0d..49acf0601 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Phishing.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/Phishing.java @@ -265,7 +265,7 @@ public class Phishing extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A4; + return Category.A4; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ReflectedXSS.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ReflectedXSS.java index 109a4024d..cd880568c 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ReflectedXSS.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ReflectedXSS.java @@ -232,7 +232,7 @@ public class ReflectedXSS extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A4; + return Category.A4; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RemoteAdminFlaw.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RemoteAdminFlaw.java index e3f2e1301..20071ba84 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RemoteAdminFlaw.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RemoteAdminFlaw.java @@ -73,7 +73,7 @@ public class RemoteAdminFlaw extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A2; + return Category.A2; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java index 4b8cd0bea..83bef96c8 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/RoleBasedAccessControl/RoleBasedAccessControl.java @@ -11,7 +11,6 @@ import org.apache.ecs.Element; import org.apache.ecs.ElementContainer; import org.apache.ecs.html.A; import org.apache.ecs.html.IMG; -import org.owasp.webgoat.lessons.AbstractLesson; import org.owasp.webgoat.lessons.Category; import org.owasp.webgoat.lessons.LessonAction; import org.owasp.webgoat.lessons.LessonAdapter; @@ -192,7 +191,7 @@ public class RoleBasedAccessControl extends LessonAdapter */ public Category getDefaultCategory() { - return AbstractLesson.A2; + return Category.A2; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java index 99f2e9e68..44ae8580f 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SQLInjection/SQLInjection.java @@ -11,7 +11,6 @@ import org.apache.ecs.Element; import org.apache.ecs.ElementContainer; import org.apache.ecs.html.A; import org.apache.ecs.html.IMG; -import org.owasp.webgoat.lessons.AbstractLesson; import org.owasp.webgoat.lessons.Category; import org.owasp.webgoat.lessons.LessonAction; import org.owasp.webgoat.lessons.LessonAdapter; @@ -202,7 +201,7 @@ public class SQLInjection extends LessonAdapter */ public Category getDefaultCategory() { - return AbstractLesson.A6; + return Category.A6; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SilentTransactions.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SilentTransactions.java index ac76705e3..676e4ff64 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SilentTransactions.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SilentTransactions.java @@ -268,7 +268,7 @@ public class SilentTransactions extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.AJAX_SECURITY; + return Category.AJAX_SECURITY; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SoapRequest.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SoapRequest.java index 10ccfaa7d..f2218b09f 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SoapRequest.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SoapRequest.java @@ -93,7 +93,7 @@ public class SoapRequest extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.WEB_SERVICES; + return Category.WEB_SERVICES; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SqlNumericInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SqlNumericInjection.java index 2a1c43f4e..41a1c2b0d 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SqlNumericInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SqlNumericInjection.java @@ -334,7 +334,7 @@ public class SqlNumericInjection extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A6; + return Category.A6; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SqlStringInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SqlStringInjection.java index 09c9ed274..40206bf2b 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SqlStringInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SqlStringInjection.java @@ -250,7 +250,7 @@ public class SqlStringInjection extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A6; + return Category.A6; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/StoredXss.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/StoredXss.java index 176383d26..79b468699 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/StoredXss.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/StoredXss.java @@ -148,7 +148,7 @@ public class StoredXss extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A4; + return Category.A4; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ThreadSafetyProblem.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ThreadSafetyProblem.java index 45b05ecd7..86c52d37e 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ThreadSafetyProblem.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ThreadSafetyProblem.java @@ -180,7 +180,7 @@ public class ThreadSafetyProblem extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.GENERAL; + return Category.GENERAL; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/TraceXSS.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/TraceXSS.java index bf13c2821..c15104c1e 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/TraceXSS.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/TraceXSS.java @@ -233,7 +233,7 @@ public class TraceXSS extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A4; + return Category.A4; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/UncheckedEmail.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/UncheckedEmail.java index eebb2b01c..47fb59693 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/UncheckedEmail.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/UncheckedEmail.java @@ -206,7 +206,7 @@ public class UncheckedEmail extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A1; + return Category.A1; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WSDLScanning.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WSDLScanning.java index 2a790a52b..c4cf058a0 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WSDLScanning.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WSDLScanning.java @@ -95,7 +95,7 @@ public class WSDLScanning extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.WEB_SERVICES; + return Category.WEB_SERVICES; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java index 6546e6673..50ece46db 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WeakAuthenticationCookie.java @@ -229,7 +229,7 @@ public class WeakAuthenticationCookie extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A3; + return Category.A3; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WeakSessionID.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WeakSessionID.java index dd334e1f2..6210511d0 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WeakSessionID.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WeakSessionID.java @@ -149,7 +149,7 @@ public class WeakSessionID extends LessonAdapter */ protected Category getDefaultCategory() { - return AbstractLesson.A3; + return Category.A3; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WsSAXInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WsSAXInjection.java index 2171ad56b..9509b2d56 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WsSAXInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WsSAXInjection.java @@ -90,7 +90,7 @@ public class WsSAXInjection extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.WEB_SERVICES; + return Category.WEB_SERVICES; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WsSqlInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WsSqlInjection.java index f39cedcc9..e20b004d6 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WsSqlInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/WsSqlInjection.java @@ -83,7 +83,7 @@ public class WsSqlInjection extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.WEB_SERVICES; + return Category.WEB_SERVICES; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java index 88f1c5cb6..35984330a 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java @@ -327,7 +327,7 @@ public class XMLInjection extends LessonAdapter protected Category getDefaultCategory() { - return AJAX_SECURITY; + return Category.AJAX_SECURITY; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XPATHInjection.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XPATHInjection.java index a8525c7c5..252b97801 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XPATHInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XPATHInjection.java @@ -224,7 +224,7 @@ public class XPATHInjection extends LessonAdapter protected Category getDefaultCategory() { - return AbstractLesson.A6; + return Category.A6; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java index 11fab36b9..42c2c6bd6 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ProductsAdminScreen.java @@ -99,7 +99,7 @@ public class ProductsAdminScreen extends LessonAdapter */ protected Category getDefaultCategory() { - return ADMIN_FUNCTIONS; + return Category.ADMIN_FUNCTIONS; } diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java index 14a114133..b29d0346e 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/RefreshDBScreen.java @@ -110,7 +110,7 @@ public class RefreshDBScreen extends LessonAdapter */ protected Category getDefaultCategory() { - return ADMIN_FUNCTIONS; + return Category.ADMIN_FUNCTIONS; } private final static Integer DEFAULT_RANKING = new Integer(1000); diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ReportCardScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ReportCardScreen.java index 0191491d8..f2c9b4675 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ReportCardScreen.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ReportCardScreen.java @@ -117,7 +117,7 @@ public class ReportCardScreen extends LessonAdapter */ protected Category getDefaultCategory() { - return ADMIN_FUNCTIONS; + return Category.ADMIN_FUNCTIONS; } private final static Integer DEFAULT_RANKING = new Integer(1000); diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java index 267af504e..90a102d2c 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/SummaryReportCardScreen.java @@ -177,7 +177,7 @@ public class SummaryReportCardScreen extends LessonAdapter */ protected Category getDefaultCategory() { - return ADMIN_FUNCTIONS; + return Category.ADMIN_FUNCTIONS; } private final static Integer DEFAULT_RANKING = new Integer(1000); diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/UserAdminScreen.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/UserAdminScreen.java index bccb7f639..b6e5d613e 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/UserAdminScreen.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/UserAdminScreen.java @@ -99,7 +99,7 @@ public class UserAdminScreen extends LessonAdapter */ protected Category getDefaultCategory() { - return ADMIN_FUNCTIONS; + return Category.ADMIN_FUNCTIONS; } private final static Integer DEFAULT_RANKING = new Integer(1000); diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ViewDatabase.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ViewDatabase.java index d7dc0827c..5c5dd1c55 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ViewDatabase.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/admin/ViewDatabase.java @@ -116,7 +116,7 @@ public class ViewDatabase extends LessonAdapter */ protected Category getDefaultCategory() { - return ADMIN_FUNCTIONS; + return Category.ADMIN_FUNCTIONS; } private final static Integer DEFAULT_RANKING = new Integer(1000); diff --git a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java index c9fe0319b..4bbf5034e 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/session/WebSession.java @@ -863,7 +863,7 @@ public class WebSession { if ( getCurrentLesson() != null ) { - return ( AbstractLesson.CHALLENGE.equals(getCurrentLesson().getCategory())); + return ( Category.CHALLENGE.equals(getCurrentLesson().getCategory())); } return false; }