allowedUrls = new HashSet<>();
+
+ @Override
+ public void init(FilterConfig filterConfig) throws ServletException {
+ allowedUrls.add("/login");
+ allowedUrls.add("/drivers/add");
+ }
+
+ @Override
+ public void doFilter(ServletRequest servletRequest,
+ ServletResponse servletResponse, FilterChain filterChain)
+ throws IOException, ServletException {
+ HttpServletRequest req = (HttpServletRequest) servletRequest;
+ HttpServletResponse resp = (HttpServletResponse) servletResponse;
+ HttpSession session = req.getSession();
+
+ Long driverId = (Long) session.getAttribute("driver_id");
+ if (driverId != null || allowedUrls.contains(req.getServletPath())) {
+ filterChain.doFilter(req, resp);
+ return;
+ }
+ resp.sendRedirect(req.getContextPath() + "/login");
+ }
+}
diff --git a/src/main/webapp/WEB-INF/views/cars/add.jsp b/src/main/webapp/WEB-INF/views/cars/add.jsp
index c23ba0b4f..5c1f158af 100644
--- a/src/main/webapp/WEB-INF/views/cars/add.jsp
+++ b/src/main/webapp/WEB-INF/views/cars/add.jsp
@@ -6,6 +6,7 @@
Add car
+ <%@include file="/WEB-INF/views/header.jsp"%>>
diff --git a/src/main/webapp/WEB-INF/views/cars/all.jsp b/src/main/webapp/WEB-INF/views/cars/all.jsp
index 84f046299..7953b2b7a 100644
--- a/src/main/webapp/WEB-INF/views/cars/all.jsp
+++ b/src/main/webapp/WEB-INF/views/cars/all.jsp
@@ -6,6 +6,7 @@
All cars
+ <%@include file="/WEB-INF/views/header.jsp"%>>
All cars:
@@ -34,7 +35,7 @@
- ${driver.id} ${driver.name} ${driver.licenseNumber}
+ ${driver.id} ${driver.name} ${driver.licenseNumber} ${driver.login}
|
diff --git a/src/main/webapp/WEB-INF/views/cars/drivers/add.jsp b/src/main/webapp/WEB-INF/views/cars/drivers/add.jsp
index d281d5d72..3d90c8be8 100644
--- a/src/main/webapp/WEB-INF/views/cars/drivers/add.jsp
+++ b/src/main/webapp/WEB-INF/views/cars/drivers/add.jsp
@@ -6,6 +6,7 @@
Add driver to car
+ <%@include file="/WEB-INF/views/header.jsp"%>>
diff --git a/src/main/webapp/WEB-INF/views/drivers/add.jsp b/src/main/webapp/WEB-INF/views/drivers/add.jsp
index 4ad7cee44..74226300f 100644
--- a/src/main/webapp/WEB-INF/views/drivers/add.jsp
+++ b/src/main/webapp/WEB-INF/views/drivers/add.jsp
@@ -6,6 +6,7 @@
All drivers
+ <%@include file="/WEB-INF/views/header.jsp"%>>
@@ -14,6 +15,8 @@
|
| Name |
License number |
+ Login |
+ Password |
Add |
@@ -23,6 +26,12 @@
|
|
+
+
+ |
+
+
+ |
|
diff --git a/src/main/webapp/WEB-INF/views/drivers/all.jsp b/src/main/webapp/WEB-INF/views/drivers/all.jsp
index 776101f73..58088358f 100644
--- a/src/main/webapp/WEB-INF/views/drivers/all.jsp
+++ b/src/main/webapp/WEB-INF/views/drivers/all.jsp
@@ -6,6 +6,7 @@
All drivers
+ <%@include file="/WEB-INF/views/header.jsp"%>>
All drivers:
@@ -14,6 +15,7 @@
ID |
Name |
License number |
+ Login |
Delete |
@@ -27,6 +29,9 @@
|
+
+
+ |
DELETE
|
diff --git a/src/main/webapp/WEB-INF/views/header.jsp b/src/main/webapp/WEB-INF/views/header.jsp
new file mode 100644
index 000000000..9c4aa36a4
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/header.jsp
@@ -0,0 +1,9 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+ Title
+
+
+Logout
+
+
diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp
index b9b5e9d2b..df1401b52 100644
--- a/src/main/webapp/WEB-INF/views/index.jsp
+++ b/src/main/webapp/WEB-INF/views/index.jsp
@@ -4,7 +4,8 @@
- My team
+ Taxi Service
+ <%@include file="header.jsp"%>>
diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp
new file mode 100644
index 000000000..47393a5d6
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/login.jsp
@@ -0,0 +1,16 @@
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+
+ Login
+
+
+Login Page
+${errorMsg}
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/manufacturers/add.jsp b/src/main/webapp/WEB-INF/views/manufacturers/add.jsp
index 108d3541c..56bbcb270 100644
--- a/src/main/webapp/WEB-INF/views/manufacturers/add.jsp
+++ b/src/main/webapp/WEB-INF/views/manufacturers/add.jsp
@@ -6,6 +6,7 @@
Manufacturers
+ <%@include file="/WEB-INF/views/header.jsp"%>>
diff --git a/src/main/webapp/WEB-INF/views/manufacturers/all.jsp b/src/main/webapp/WEB-INF/views/manufacturers/all.jsp
index fd3eafdbf..b93f72cb8 100644
--- a/src/main/webapp/WEB-INF/views/manufacturers/all.jsp
+++ b/src/main/webapp/WEB-INF/views/manufacturers/all.jsp
@@ -6,6 +6,7 @@
All manufacturers
+ <%@include file="/WEB-INF/views/header.jsp"%>>
All manufacturers:
diff --git a/src/main/webapp/web.xml b/src/main/webapp/web.xml
index 284381048..3529ecc54 100644
--- a/src/main/webapp/web.xml
+++ b/src/main/webapp/web.xml
@@ -105,4 +105,40 @@
deleteManufacturer
/manufacturers/delete
+
+
+ loginController
+ taxi.controller.LoginController
+
+
+ loginController
+ /login
+
+
+
+ logoutController
+ taxi.controller.LoginController
+
+
+ logoutController
+ /logout
+
+
+
+ getAllCarsController
+ taxi.controller.car.GetAllCarsController
+
+
+ getAllCarsController
+ /drivers/cars
+
+
+
+ authenticationFilter
+ taxi.web.filter.AuthenticationFilter
+
+
+ authenticationFilter
+ /*
+