Skip to content

Commit 170d8bd

Browse files
mzhang28mzhang28
committed
should only set cookies on sign-in
1 parent 72b4fb7 commit 170d8bd

File tree

12 files changed

+225
-17
lines changed

12 files changed

+225
-17
lines changed

‎api/auth.js

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ exports.is_authorized = function(req, res) {
5050
exports.login = function(req, res) {
5151
if (req.param("teamname") && req.param("password")) {
5252
authenticate(req, res, req.param("teamname"), req.param("password"), false, function(result) {
53+
if (!req.cookies.teamname)
54+
res.cookie("teamname", teamname);
55+
if (!req.cookies.password)
56+
res.cookie("password", common.encryptPass(password));
5357
res.send(result);
5458
return;
5559
})
@@ -98,9 +102,13 @@ var checkAuth = function(req, res) {
98102
}
99103
};
100104

105+
exports.authenticate = function(req, res, teamname, password, isHash, callback) {
106+
authenticate(req, res, teamname, password, isHash, callback);
107+
};
108+
101109
var authenticate = function(req, res, teamname, password, isHash, callback) {
102-
res.cookie("teamname", "");
103-
res.cookie("password", "");
110+
// res.cookie("teamname", "");
111+
// res.cookie("password", "");
104112
if (teamname == undefined || teamname == "") {
105113
callback({
106114
success: 0,
@@ -156,10 +164,6 @@ var authenticate = function(req, res, teamname, password, isHash, callback) {
156164
if (isHash ? password == pwHash : common.validatePassword(password, pwHash)) {
157165
req.session.group = team.group || 1;
158166
req.session.tID = team._id.valueOf();
159-
if (!req.cookies.teamname)
160-
res.cookie("teamname", teamname);
161-
if (!req.cookies.password)
162-
res.cookie("password", pwHash);
163167
callback({
164168
success: 1,
165169
message: "Logged in."

‎api/static/scoreboard.html

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<table class="table table-striped table-hover" style="table-layout: fixed; width: 100%;">
2+
<thead><tr>
3+
<th style="width:10%;">Place</th>
4+
<th style="width:60%;">Team</th>
5+
<th style="width:20%;">School</th>
6+
<th style="width:10%;">Score</th></tr></thead>
7+
<tr>
8+
<td>1</td>
9+
<td style="word-break:break-all;">lolteam</td>
10+
<td style="word-break:break-all;">lolschool</td>
11+
<td>0</td>
12+
</tr>
13+
</table>

‎app/pages/about.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</nav>
2929

3030
<div class="container">
31-
<div>
31+
<div class="container">
3232
<div class="jumbotron">
3333
<center><h1>Some meta information</h1></center>
3434
</div>

‎app/pages/account.html

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
6+
7+
<title>CTF Platform</title>
8+
9+
<link rel="stylesheet" href="css/main.css" media="screen" />
10+
<link rel="icon" href="images/logo.ico" media="screen" />
11+
</head>
12+
13+
<body>
14+
<nav role="navigation" class="navbar navbar-default">
15+
<div class="container-fluid">
16+
<div class="navbar-header">
17+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-content">
18+
<span class="sr-only">Toggle Navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span>
19+
</button><a href="/" class="navbar-brand">CTF-Platform</a>
20+
</div>
21+
<div id="navbar-content" class="collapse navbar-collapse">
22+
<ul class="nav navbar-nav" id="nav-left">
23+
</ul>
24+
<ul class="nav navbar-nav navbar-right" id="nav-right">
25+
</ul>
26+
</div>
27+
</div>
28+
</nav>
29+
30+
<div class="container">
31+
<div class="container">
32+
<div class="page-header">
33+
<h1>Account Settings</h1>
34+
</div>
35+
36+
<div id="update_msg"></div>
37+
38+
<div class="well col-lg-7">
39+
<form action="javascript:updateInfo()" class="form-horizontal">
40+
<fieldset>
41+
<legend>Basic Account Info</legend>
42+
<div class="form-group">
43+
<label for="account-name" class="col-lg-3 control-label">Team Name</label>
44+
<div class="col-lg-8">
45+
<input id="account-name" type="text" name="account-name" placeholder="Team Name" class="form-control">
46+
</div>
47+
</div>
48+
<div class="form-group">
49+
<label class="col-lg-3 control-label">Email
50+
<br /><small>Sorry, can't change this.</small>
51+
</label>
52+
<div class="col-lg-8">
53+
<input id="account-email" type="text" disabled placeholder="Email" class="form-control">
54+
</div>
55+
</div>
56+
<div class="form-group">
57+
<label for="account-school" class="col-lg-3 control-label">School / Affiliation</label>
58+
<div class="col-lg-8">
59+
<input id="account-school" type="text" name="account-school" placeholder="School / Affiliation" class="form-control">
60+
</div>
61+
</div>
62+
<div class="form-group">
63+
<label for="account-password" class="col-lg-3 control-label">New Password
64+
<br /><small>Leave blank to leave unchanged.</small>
65+
</label>
66+
<div class="col-lg-8">
67+
<input id="account-password" type="password" name="account-password" placeholder="New password" class="form-control">
68+
</div>
69+
</div>
70+
</fieldset>
71+
<fieldset>
72+
<legend>Type your Password to Confirm</legend>
73+
<div class="form-group">
74+
<label for="account-confirm" class="col-lg-3 control-label">Confirm Changes</label>
75+
<div class="col-lg-8">
76+
<input id="account-confirm" type="password" name="account-confirm" placeholder="Confirm changes" class="form-control">
77+
</div>
78+
</div>
79+
<div class="form-group">
80+
<label for="account-submit" class="col-lg-3 control-label"></label>
81+
<div class="col-lg-8">
82+
<input id="account-submit" type="submit" name="account-submit" value="Update Account" class="btn btn-primary">
83+
</div>
84+
</div>
85+
</fieldset>
86+
</form>
87+
</div>
88+
</div>
89+
90+
<div id="footer"></div>
91+
</div>
92+
93+
<script type="text/javascript" src="js/jquery.js"></script>
94+
<script type="text/javascript" src="js/bootstrap.min.js"></script>
95+
<script type="text/javascript" src="js/dependencies.js"></script>
96+
<script type="text/javascript">
97+
$(function() {
98+
display_navbar();
99+
load_footer();
100+
});
101+
</script>
102+
</body>
103+
</html>

‎app/pages/login.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</nav>
2929

3030
<div class="container">
31-
<div>
31+
<div class="container">
3232
<div class="page-header">
3333
<h1>Login</h1>
3434
</div>

‎app/pages/logout.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</nav>
2929

3030
<div class="container">
31-
<div>
31+
<div class="container">
3232
Logging out...
3333
</div>
3434

‎app/pages/problems.html

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
6+
7+
<title>Problems - CTF Platform</title>
8+
9+
<link rel="stylesheet" href="css/main.css" media="screen" />
10+
<link rel="icon" href="images/logo.ico" media="screen" />
11+
</head>
12+
13+
<body>
14+
<nav role="navigation" class="navbar navbar-default">
15+
<div class="container-fluid">
16+
<div class="navbar-header">
17+
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-content">
18+
<span class="sr-only">Toggle Navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span>
19+
</button><a href="/" class="navbar-brand">CTF-Platform</a>
20+
</div>
21+
<div id="navbar-content" class="collapse navbar-collapse">
22+
<ul class="nav navbar-nav" id="nav-left">
23+
</ul>
24+
<ul class="nav navbar-nav navbar-right" id="nav-right">
25+
</ul>
26+
</div>
27+
</div>
28+
</nav>
29+
30+
<div class="container">
31+
<div class="container">
32+
<div class="page-header">
33+
<h1>Problems</h1>
34+
</div>
35+
</div>
36+
37+
<div id="footer"></div>
38+
</div>
39+
40+
<script type="text/javascript" src="js/jquery.js"></script>
41+
<script type="text/javascript" src="js/bootstrap.min.js"></script>
42+
<script type="text/javascript" src="js/dependencies.js"></script>
43+
<script type="text/javascript">
44+
$(function() {
45+
display_navbar();
46+
load_footer();
47+
});
48+
</script>
49+
</body>
50+
</html>

‎app/pages/register.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</nav>
2929

3030
<div class="container">
31-
<div>
31+
<div class="container">
3232
<div class="page-header">
3333
<h1>Register for CTF-Platform</h1>
3434
</div>

‎app/pages/scoreboard.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</nav>
2929

3030
<div class="container">
31-
<div>
31+
<div class="container">
3232
<div class="page-header">
3333
<h1>Scoreboard</h1>
3434
</div>

‎app/pages/teapot.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<h1>I'm a teapot</h1>
2+
3+
<p>The requested url may have a body that is short and stout.</p>
4+
5+
<hr>
6+
7+
<p><i>Express (Node.js) Server at easyctf/ctf-platform Port 3000</i></p>

0 commit comments

Comments
 (0)