From 38e9a8967bd7dd620160fffc689394337279b92f Mon Sep 17 00:00:00 2001 From: "sherif.fathy" Date: Wed, 24 Jan 2007 05:10:43 +0000 Subject: [PATCH] Added the AoC logo git-svn-id: http://webgoat.googlecode.com/svn/trunk@80 4033779f-a91e-0410-96ef-6bf7bf53c507 --- .../org/owasp/webgoat/lessons/BackDoors.java | 4 +++- .../org/owasp/webgoat/lessons/CSRF.java | 10 +++++++--- .../org/owasp/webgoat/lessons/DOMInjection.java | 10 ++++------ .../owasp/webgoat/lessons/ForcedBrowsing.java | 3 ++- .../org/owasp/webgoat/lessons/HttpSplitting.java | 6 +++--- .../org/owasp/webgoat/lessons/JSONInjection.java | 11 ++++++----- .../org/owasp/webgoat/lessons/LessonAdapter.java | 2 ++ .../org/owasp/webgoat/lessons/LogSpoofing.java | 2 +- .../org/owasp/webgoat/lessons/NewLesson.java | 6 +++--- .../webgoat/lessons/SilentTransactions.java | 4 ++-- .../org/owasp/webgoat/lessons/XMLInjection.java | 5 +++-- .../owasp/webgoat/lessons/XPATHInjection.java | 4 ++-- .../project/WebContent/images/logos/AOC_Logo.jpg | Bin 0 -> 2706 bytes 13 files changed, 38 insertions(+), 29 deletions(-) create mode 100644 webgoat/main/project/WebContent/images/logos/AOC_Logo.jpg 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 4c5408ad0..d350c25c1 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/BackDoors.java @@ -50,6 +50,8 @@ import org.owasp.webgoat.session.WebSession; * for free software projects. * * For details, please see http://code.google.com/p/webgoat/ + * + * @author Sherif Koussa Macadamian Technologies. */ public class BackDoors extends LessonAdapter { @@ -257,7 +259,7 @@ public class BackDoors extends LessonAdapter public Element getCredits() { - return new StringElement("Created by Sherif Koussa"); + return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO); } 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 80617b791..ffd60e4dc 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/CSRF.java @@ -52,6 +52,9 @@ import org.owasp.webgoat.util.HtmlEncoder; * for free software projects. * * For details, please see http://code.google.com/p/webgoat/ + * + * @author Sherif Koussa Macadamian Technologies. + */ public class CSRF extends LessonAdapter { @@ -320,8 +323,9 @@ public class CSRF extends LessonAdapter { return nameroot; } - public Element getCredits() { - return new StringElement("Created by Sherif Koussa"); - } + public Element getCredits() + { + return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO); + } } 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 1d3d7b16b..02a33abc9 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOMInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/DOMInjection.java @@ -44,7 +44,7 @@ import org.owasp.webgoat.session.WebSession; * * For details, please see http://code.google.com/p/webgoat/ * - * @author Sherif Koussa WebGoat + * @author Sherif Koussa Macadamian Technologies. * @created October 28, 2006 */ @@ -152,7 +152,7 @@ public class DOMInjection extends LessonAdapter public Element getCredits() { - return new StringElement("Created by Sherif Koussa"); + return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO); } @@ -175,10 +175,8 @@ public class DOMInjection extends LessonAdapter List hints = new ArrayList(); hints.add("This page is using XMLHTTP to comunicate with the server."); - hints - .add("Try to find a way to inject the DOM to enable the Activate button."); - hints - .add("Intercept the reply and replace the body with document.forms[0].SUBMIT.disabled = false;"); + hints.add("Try to find a way to inject the DOM to enable the Activate button."); + hints.add("Intercept the reply and replace the body with document.forms[0].SUBMIT.disabled = false;"); return hints; } 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 9944680b9..3d837a3ab 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/ForcedBrowsing.java @@ -43,6 +43,7 @@ import org.owasp.webgoat.session.WebSession; * for free software projects. * * For details, please see http://code.google.com/p/webgoat/ + * * @author Sherif Koussa Macadamian Technologies. * @created November 02, 2006 */ @@ -152,6 +153,6 @@ public class ForcedBrowsing extends LessonAdapter public Element getCredits() { - return new StringElement("Created by Sherif Koussa"); + return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO); } } 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 517f2cbca..aeab40255 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpSplitting.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/HttpSplitting.java @@ -41,8 +41,8 @@ import org.owasp.webgoat.session.WebSession; * for free software projects. * * For details, please see http://code.google.com/p/webgoat/ - * - * @author sherif@macadamian.com + * + * @author Sherif Koussa Macadamian Technologies. * @created September 30, 2006 */ @@ -289,7 +289,7 @@ public class HttpSplitting extends LessonAdapter public Element getCredits() { - return new StringElement("Created by Sherif Koussa"); + return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO); } } 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 8f699db56..56977a627 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JSONInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/JSONInjection.java @@ -45,8 +45,8 @@ import java.util.ArrayList; * for free software projects. * * For details, please see http://code.google.com/p/webgoat/ - * - * @author sherif@macadamian.com + * + * @author Sherif Koussa Macadamian Technologies. * @created December 25, 2006 */ @@ -270,9 +270,10 @@ public class JSONInjection extends LessonAdapter return ec; } - public Element getCredits() { - return new StringElement("Created by Sherif Koussa"); - } + public Element getCredits() + { + return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO); + } protected Category getDefaultCategory() { 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 5fd0581ce..6e3b74883 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LessonAdapter.java @@ -56,6 +56,8 @@ public abstract class LessonAdapter extends AbstractLesson final static IMG WEBGOAT_LOGO = new IMG("images/logos/WebGoat.jpg").setAlt( "WebGoat Logo").setBorder(0).setHspace(0).setVspace(0); + final static IMG AOC_LOGO = new IMG("images/logos/AOC_Logo.jpg").setAlt( + "OWASP Autumn of Code").setBorder(0).setHspace(0).setVspace(0); /** * Description of the Method 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 a6c98fc97..f3f78cdeb 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LogSpoofing.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/LogSpoofing.java @@ -166,6 +166,6 @@ public class LogSpoofing extends LessonAdapter public Element getCredits() { - return new StringElement("Created by Sherif Koussa"); + return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO); } } 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 e1e928649..ec2758c2e 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/NewLesson.java @@ -33,8 +33,8 @@ import org.owasp.webgoat.session.WebSession; * for free software projects. * * For details, please see http://code.google.com/p/webgoat/ - * - * @author Sherif Koussa WebGoat + * + * @author Sherif Koussa Macadamian Technologies. * @created October 28, 2003 */ public class NewLesson extends LessonAdapter @@ -86,6 +86,6 @@ public class NewLesson extends LessonAdapter public Element getCredits() { - return new StringElement("Created by Sherif Koussa"); + return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO); } } 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 a1778bb9f..25a9af4b2 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SilentTransactions.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/SilentTransactions.java @@ -48,7 +48,7 @@ import org.owasp.webgoat.session.WebSession; * * For details, please see http://code.google.com/p/webgoat/ * - * @author Sherif Koussa WebGoat + * @author Sherif Koussa Macadamian Technologies. * @created December 26, 2006 */ @@ -306,7 +306,7 @@ public class SilentTransactions extends LessonAdapter public Element getCredits() { - return new StringElement("Created by Sherif Koussa"); + return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO); } } 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 173972f2b..3cc7944be 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XMLInjection.java @@ -51,6 +51,8 @@ import org.owasp.webgoat.session.WebSession; * for free software projects. * * For details, please see http://code.google.com/p/webgoat/ + * + * @author Sherif Koussa Macadamian Technologies. */ public class XMLInjection extends LessonAdapter { @@ -319,8 +321,7 @@ public class XMLInjection extends LessonAdapter public Element getCredits() { - - return new StringElement("Created by Sherif Koussa"); + return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO); } 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 38e98a9ef..645b66476 100644 --- a/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XPATHInjection.java +++ b/ webgoat/main/project/JavaSource/org/owasp/webgoat/lessons/XPATHInjection.java @@ -64,7 +64,7 @@ import org.owasp.webgoat.session.ECSFactory; * * For details, please see http://code.google.com/p/webgoat/ * - * @author Sherif Koussa WebGoat + * @author Sherif Koussa Macadamian Technologies. * @created November 28, 2006 */ @@ -214,7 +214,7 @@ public class XPATHInjection extends LessonAdapter public Element getCredits() { - return new StringElement("Created by Sherif Koussa"); + return super.getCustomCredits("Created by Sherif Koussa - Macadamian Technologies", AOC_LOGO); } diff --git a/ webgoat/main/project/WebContent/images/logos/AOC_Logo.jpg b/ webgoat/main/project/WebContent/images/logos/AOC_Logo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..183edbaadfdcc02de7a217562f4ea6a16053893c GIT binary patch literal 2706 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 H?2Y{s_+PTs literal 0 HcmV?d00001