Skip to content

Commit 6a35900

Browse files
author
mendrika261
committed
sprint15: resolve session bugs
1 parent 71bb033 commit 6a35900

11 files changed

Lines changed: 415 additions & 60 deletions

File tree

‎.framework/dev_files/etu2024/framework/core/ModelView.java‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import etu2024.framework.utility.Conf;
44
import etu2024.framework.utility.User;
55

6+
import java.util.ArrayList;
67
import java.util.HashMap;
8+
import java.util.List;
79

810

911
// This class is used to store the view and the data to be sent to the view
@@ -13,6 +15,8 @@ public class ModelView {
1315
HashMap<String, Object> session = new HashMap<>();
1416
boolean isJson = false;
1517
boolean isRedirect = false;
18+
boolean invalidateSession = false; // Remove all session items if true
19+
List<String> removeSessions = new ArrayList<>(); // Remove specific session items
1620

1721
// Constructor
1822
public ModelView() {}
@@ -105,7 +109,7 @@ public void addSessionItem(String key, Object value) {
105109
}
106110

107111
public void removeSessionItem(String key) {
108-
getSession().put(key, null);
112+
getRemoveSessions().add(key);
109113
}
110114

111115
public boolean isJson() {
@@ -123,4 +127,20 @@ public boolean isRedirect() {
123127
public void setRedirect(boolean isRedirect) {
124128
this.isRedirect = isRedirect;
125129
}
130+
131+
public List<String> getRemoveSessions() {
132+
return removeSessions;
133+
}
134+
135+
public void setRemoveSessions(List<String> removeSessions) {
136+
this.removeSessions = removeSessions;
137+
}
138+
139+
public boolean isInvalidateSession() {
140+
return invalidateSession;
141+
}
142+
143+
public void setInvalidateSession(boolean invalidateSession) {
144+
this.invalidateSession = invalidateSession;
145+
}
126146
}

‎.framework/dev_files/etu2024/framework/servlet/FrontServlet.java‎

Lines changed: 75 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.lang.reflect.InvocationTargetException;
2222
import java.lang.reflect.Method;
2323
import java.lang.reflect.Parameter;
24+
import java.net.http.HttpRequest;
2425
import java.util.*;
2526

2627
@MultipartConfig
@@ -73,38 +74,46 @@ private void processRequest(HttpServletRequest request, HttpServletResponse resp
7374
Method method = Tools.getMethodByName(objectClass, mapping.getMethod());
7475
List<Object> parameters = setMethodParameters(method, request);
7576

76-
// 3. Call the method from the mapping
77-
// Check if client authorized to call the method (if the method is annotated with @Auth)
78-
HttpSession session = request.getSession();
79-
Object profile = session.getAttribute(Conf.getAuthSessionName());
80-
if(!User.isAuthorized(method, profile)) {
81-
response.sendRedirect(getServletContext().getContextPath()+Conf.getAuthRedirections().get("AUTH_REDIRECT_LOGOUT"));
82-
return;
83-
}
8477

8578
// @RestAPI function directly return JSON
8679
if(method.isAnnotationPresent(RestAPI.class)) {
8780
printJson(method.invoke(object, parameters.toArray()), response);
8881
return;
8982
}
9083

84+
// Check if the method return a ModelView object
9185
Object functionReturn = method.invoke(object, parameters.toArray());
9286
if(functionReturn == null || functionReturn.getClass() != ModelView.class) {
9387
response.sendError(500, "FRAMEWORK ERROR - The method \"" + method.getName() + "\" in the class \"" +
9488
objectClass.getName() + "\" make errors, make sure it return a ModelView object or use @RestAPI" +
9589
" to return all types");
9690
return;
9791
}
92+
93+
// Get the modelView object
9894
ModelView modelView = (ModelView) functionReturn;
9995

100-
// 4. Set the session attributes if the method or the class is annotated with @Session
101-
if(method.isAnnotationPresent(Session.class) || objectClass.isAnnotationPresent(Session.class) ||
102-
method.isAnnotationPresent(Auth.class)) {
103-
setSessions(modelView, session);
104-
} else {
105-
if(!modelView.getSession().isEmpty())
106-
throw new RuntimeException("FRAMEWORK ERROR - You can't set or get session attributes if the method" +
107-
" or the class is not annotated with @Session");
96+
97+
// Handle session
98+
HttpSession session = request.getSession();
99+
100+
// Set the session attributes from modelView to the request
101+
setSessionsToTheRequest(modelView, session);
102+
103+
// Set the session attributes from request to controller if the method or the class is annotated with @Session
104+
if(method.isAnnotationPresent(Session.class) || objectClass.isAnnotationPresent(Session.class)) {
105+
setSessionsFromRequest(object, request, response);
106+
}
107+
108+
// Re-get the modelView with the new session attributes
109+
modelView = (ModelView) method.invoke(object, parameters.toArray());
110+
111+
112+
// Check if client authorized to call the method (if the method is annotated with @Auth)
113+
Object profile = session.getAttribute(Conf.getAuthSessionName());
114+
if(!User.isAuthorized(method, profile)) {
115+
response.sendRedirect(getServletContext().getContextPath()+Conf.getAuthRedirections().get("AUTH_REDIRECT_LOGOUT"));
116+
return;
108117
}
109118

110119
// Set the attributes from the modelView to the request
@@ -195,21 +204,60 @@ public Object constructObject(Class<?> objectClass) throws NoSuchMethodException
195204
return objectClass.getDeclaredConstructor().newInstance();
196205
}
197206

198-
// Set session attributes from the modelView to the session and vice versa
199-
public void setSessions(ModelView modelView, HttpSession session) {
200-
// Set session attributes from the modelView to the request
201-
for (String key : modelView.getSession().keySet()) {
202-
// If the value is null, remove the attribute from the session
203-
if (modelView.getSession().get(key) == null)
207+
// Set session attributes from the modelView to the session
208+
public void setSessionsToTheRequest(ModelView modelView, HttpSession session) {
209+
/* Removing session */
210+
// If invalidateSession is true, invalidate the session
211+
if(modelView.isInvalidateSession()) {
212+
// Iterate over the session attributes and remove them
213+
Enumeration<String> sessionAttributes = session.getAttributeNames();
214+
while(sessionAttributes.hasMoreElements())
215+
session.removeAttribute(sessionAttributes.nextElement());
216+
}
217+
// If the removeSession list is not empty
218+
if(!modelView.getRemoveSessions().isEmpty()) {
219+
for(String key : modelView.getRemoveSessions())
204220
session.removeAttribute(key);
205-
else
206-
session.setAttribute(key, modelView.getSession().get(key));
207221
}
208222

209-
// Set session from the request to the modelView
210-
for (Enumeration<String> e = session.getAttributeNames(); e.hasMoreElements(); ) {
223+
/* Adding session */
224+
for (String key : modelView.getSession().keySet()) {
225+
session.setAttribute(key, modelView.getSession().get(key));
226+
}
227+
}
228+
229+
// Set session from the request to the modelView
230+
public void setSessionsFromRequest(Object object, HttpServletRequest request, HttpServletResponse response) throws IOException {
231+
// Check if the session is new or invalidated
232+
HttpSession existingSession = request.getSession(false);
233+
if(existingSession == null || existingSession.isNew()) {
234+
return;
235+
}
236+
237+
// Get the field where sessions attributes are stored
238+
Field field;
239+
try {
240+
field = object.getClass().getDeclaredField("sessions");
241+
} catch (NoSuchFieldException ex) {
242+
throw new RuntimeException("FRAMEWORK ERROR - You can't get session attributes if the class `"+ object.getClass().getName()
243+
+"` does not have " +
244+
"`Hashmap<String, Object> sessions` as a field");
245+
}
246+
// Set the field accessible
247+
field.setAccessible(true);
248+
249+
// Iterate over the session attributes and add them to the HashMap
250+
HashMap<String, Object> sessions = new HashMap<>();
251+
for (Enumeration<String> e = request.getSession().getAttributeNames(); e.hasMoreElements(); ) {
211252
String key = e.nextElement();
212-
modelView.addSessionItem(key, session.getAttribute(key));
253+
sessions.put(key, request.getSession().getAttribute(key));
254+
}
255+
256+
try {
257+
field.set(object, sessions);
258+
} catch (IllegalAccessException ex) {
259+
throw new RuntimeException("FRAMEWORK ERROR - Cannot have access to the field sessions, be sure that the " +
260+
"field is public");
213261
}
214262
}
215263

‎.framework/framework.jar‎

1.35 KB
Binary file not shown.

‎LICENSE‎

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

0 commit comments

Comments
 (0)