Minor Syntax cleanup.

git-svn-id: http://webgoat.googlecode.com/svn/trunk@85 4033779f-a91e-0410-96ef-6bf7bf53c507
This commit is contained in:
esheri3 2007-01-25 19:31:50 +00:00
parent 9db0e6eeb3
commit 5dbb0ca372

View File

@ -55,8 +55,7 @@ import org.owasp.webgoat.session.WebSession;
public class ForgotPassword extends LessonAdapter public class ForgotPassword extends LessonAdapter
{ {
final static IMG ASPECT_LOGO = new IMG("images/logos/aspect.jpg").setAlt( final static IMG ASPECT_LOGO = new IMG("images/logos/aspect.jpg").setAlt("Aspect Security").setBorder(0).setHspace(0).setVspace(0);
"Aspect Security").setBorder(0).setHspace(0).setVspace(0);
private final static String USERNAME = "Username"; private final static String USERNAME = "Username";
@ -93,10 +92,8 @@ public class ForgotPassword extends LessonAdapter
{ {
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
ec.addElement(new BR().addElement(new H1() ec.addElement(new BR().addElement(new H1().addElement("Webgoat Password Recovery ")));
.addElement("Webgoat Password Recovery "))); Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0)
.setWidth("90%").setAlign("center");
if (s.isColor()) if (s.isColor())
{ {
@ -104,11 +101,7 @@ public class ForgotPassword extends LessonAdapter
} }
TR tr = new TR(); TR tr = new TR();
tr tr.addElement(new TH().addElement("Please input your username. See the OWASP admin if you do not have an account.").setColSpan(2).setAlign("left"));
.addElement(new TH()
.addElement(
"Please input your username. See the OWASP admin if you do not have an account.")
.setColSpan(2).setAlign("left"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
@ -139,8 +132,7 @@ public class ForgotPassword extends LessonAdapter
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
ec.addElement(new H1().addElement("Webgoat Password Recovery ")); ec.addElement(new H1().addElement("Webgoat Password Recovery "));
Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0) Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
if (s.isColor()) if (s.isColor())
{ {
@ -148,13 +140,11 @@ public class ForgotPassword extends LessonAdapter
} }
TR tr = new TR(); TR tr = new TR();
tr.addElement(new TH().addElement( tr.addElement(new TH().addElement("Secret Question: What is your favorite color?").setColSpan(2).setAlign("left"));
"Secret Question: What is your favorite color?").setColSpan(2)
.setAlign("left"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement("*Required Fields").setWidth("20%")); tr.addElement(new TD().addElement("*Required Fields").setWidth("30%"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
@ -181,8 +171,7 @@ public class ForgotPassword extends LessonAdapter
ElementContainer ec = new ElementContainer(); ElementContainer ec = new ElementContainer();
ec.addElement(new H1().addElement("Webgoat Password Recovery ")); ec.addElement(new H1().addElement("Webgoat Password Recovery "));
Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0) Table t = new Table().setCellSpacing(0).setCellPadding(2).setBorder(0).setWidth("90%").setAlign("center");
.setWidth("90%").setAlign("center");
if (s.isColor()) if (s.isColor())
{ {
@ -190,32 +179,23 @@ public class ForgotPassword extends LessonAdapter
} }
TR tr = new TR(); TR tr = new TR();
tr tr.addElement(new TH().addElement("For security reasons, please change your password immediately.").setColSpan(2).setAlign("left"));
.addElement(new TH()
.addElement(
"For security reasons, please change your password immediately.")
.setColSpan(2).setAlign("left"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement( tr.addElement(new TD().addElement(new BR().addElement(new B().addElement(new StringElement("Results:")))).setAlign("left"));
new BR().addElement(new B().addElement(new StringElement(
"Results:")))).setAlign("left"));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement(new StringElement("Username: " tr.addElement(new TD().addElement(new StringElement("Username: " + USERNAME_RESPONSE)));
+ USERNAME_RESPONSE)));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement(new StringElement("Color: " tr.addElement(new TD().addElement(new StringElement("Color: " + COLOR_RESPONSE)));
+ COLOR_RESPONSE)));
t.addElement(tr); t.addElement(tr);
tr = new TR(); tr = new TR();
tr.addElement(new TD().addElement(new StringElement("Password: " tr.addElement(new TD().addElement(new StringElement("Password: " + USERS.get(USERNAME_RESPONSE).toString())));
+ USERS.get(USERNAME_RESPONSE).toString())));
t.addElement(tr); t.addElement(tr);
ec.addElement(t); ec.addElement(t);
@ -224,11 +204,9 @@ public class ForgotPassword extends LessonAdapter
{ {
makeSuccess(s); makeSuccess(s);
} }
else if (!USERNAME_RESPONSE.equals("webgoat") else if (!USERNAME_RESPONSE.equals("webgoat") && USERS.containsKey(USERNAME_RESPONSE))
&& USERS.containsKey(USERNAME_RESPONSE))
{ {
s s.setMessage("Close. Now try to get the password of a privileged account.");
.setMessage("Close. Now try to get the password of a privileged account.");
} }
return ec; return ec;
} }
@ -270,8 +248,7 @@ public class ForgotPassword extends LessonAdapter
} }
else else
{ {
s.setMessage("Incorrect response for " + USERNAME_RESPONSE s.setMessage("Incorrect response for " + USERNAME_RESPONSE + ". Please try again!");
+ ". Please try again!");
ec.addElement(doStage2(s)); ec.addElement(doStage2(s));
} }
} }
@ -288,7 +265,9 @@ public class ForgotPassword extends LessonAdapter
else else
{ {
if (username.length() > 0) if (username.length() > 0)
s.setMessage("Not a valid username. Please try again"); {
s.setMessage("Not a valid username. Please try again.");
}
ec.addElement(doStage1(s)); ec.addElement(doStage1(s));
} }
} }
@ -322,10 +301,9 @@ public class ForgotPassword extends LessonAdapter
public List getHints() public List getHints()
{ {
List<String> hints = new ArrayList<String>(); List<String> hints = new ArrayList<String>();
hints
.add("There is no lock out policy in place, brute force your way!"); hints.add("There is no lock out policy in place, brute force your way!");
hints hints.add("Try using usernames you might encounter throughout WebGoat.");
.add("Try using usernames you might encounter throughout WebGoat.");
hints.add("There are only so many possible colors, can you guess one?"); hints.add("There are only so many possible colors, can you guess one?");
hints.add("The administrative account is \"admin\""); hints.add("The administrative account is \"admin\"");
@ -354,6 +332,6 @@ public class ForgotPassword extends LessonAdapter
public Element getCredits() public Element getCredits()
{ {
return super.getCustomCredits("The Intern", ASPECT_LOGO); return super.getCustomCredits("Eric Sheridan ", ASPECT_LOGO);
} }
} }