+
+
diff --git a/frontend/src/app/adminui/edituser/edituser.component.scss b/frontend/src/app/adminui/edituser/edituser.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/frontend/src/app/adminui/edituser/edituser.component.spec.ts b/frontend/src/app/adminui/edituser/edituser.component.spec.ts
new file mode 100644
index 0000000..3537722
--- /dev/null
+++ b/frontend/src/app/adminui/edituser/edituser.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EdituserComponent } from './edituser.component';
+
+describe('EdituserComponent', () => {
+ let component: EdituserComponent;
+ let fixture: ComponentFixtureOperations
+ +Login history
+
+
+
+
+
diff --git a/frontend/src/app/adminui/loginhistory/loginhistory.component.scss b/frontend/src/app/adminui/loginhistory/loginhistory.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/frontend/src/app/adminui/loginhistory/loginhistory.component.spec.ts b/frontend/src/app/adminui/loginhistory/loginhistory.component.spec.ts
new file mode 100644
index 0000000..4bd4b13
--- /dev/null
+++ b/frontend/src/app/adminui/loginhistory/loginhistory.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LoginhistoryComponent } from './loginhistory.component';
+
+describe('LoginhistoryComponent', () => {
+ let component: LoginhistoryComponent;
+ let fixture: ComponentFixture| Login Time | +Login IP | +
|---|---|
| {{ entry.loginTime | date: 'dd. MMMM yyyy, HH:mm:ss' }} | +{{ entry.loginIp }} | +
Privacy Policy | Terms of Use
+
+
+
diff --git a/frontend/src/app/credits/credits.component.ts b/frontend/src/app/credits/credits.component.ts
index 2aacf5b..35df6f2 100644
--- a/frontend/src/app/credits/credits.component.ts
+++ b/frontend/src/app/credits/credits.component.ts
@@ -32,7 +32,7 @@ export class CreditsComponent {
}
getVersion() {
- axios.get(this.developmentStore.getBaseUrl() + 'api/v1/version')
+ axios.get(this.developmentStore.getBaseUrl() + 'api/v1/public/version')
.then((response) => {
this.version = response.data;
})
diff --git a/frontend/src/app/download/download.component.html b/frontend/src/app/download/download.component.html
index 0965040..91ea066 100644
--- a/frontend/src/app/download/download.component.html
+++ b/frontend/src/app/download/download.component.html
@@ -8,7 +8,7 @@
© 2024 SharePulse. All rights reserved.
+
+ (keydown.enter)="requestDownload()"/>
{
@@ -119,7 +119,7 @@ export class DownloadComponent {
private getDownloadInfo() {
axios({
method: 'get',
- url: this.developmentStore.getBaseUrl() + 'api/v1/download-info?fileId=' + this.fileId,
+ url: this.developmentStore.getBaseUrl() + 'api/v1/public/download-info?fileId=' + this.fileId,
responseType: 'json',
})
.then(response => {
@@ -138,7 +138,7 @@ export class DownloadComponent {
this.fileDownloadStarted = true;
axios({
method: 'get',
- url: this.developmentStore.getBaseUrl() + 'api/v1/download?fileId=' + this.fileId + '&password=' + this.filePassword,
+ url: this.developmentStore.getBaseUrl() + 'api/v1/public/download?fileId=' + this.fileId + '&password=' + this.filePassword,
responseType: 'arraybuffer',
onDownloadProgress: (progressEvent) => {
const endTime = new Date().getTime();
diff --git a/frontend/src/app/duration.pipe.spec.ts b/frontend/src/app/duration.pipe.spec.ts
new file mode 100644
index 0000000..e38345d
--- /dev/null
+++ b/frontend/src/app/duration.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { DurationPipe } from './duration.pipe';
+
+describe('DurationPipe', () => {
+ it('create an instance', () => {
+ const pipe = new DurationPipe();
+ expect(pipe).toBeTruthy();
+ });
+});
diff --git a/frontend/src/app/duration.pipe.ts b/frontend/src/app/duration.pipe.ts
new file mode 100644
index 0000000..f94ee9a
--- /dev/null
+++ b/frontend/src/app/duration.pipe.ts
@@ -0,0 +1,29 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: 'duration',
+ standalone: true
+})
+export class DurationPipe implements PipeTransform {
+
+ transform(value: number): string {
+ if (!value) {
+ return '0m';
+ }
+
+ let milliseconds = value;
+ const days = Math.floor(milliseconds / (24 * 60 * 60 * 1000));
+ milliseconds %= 24 * 60 * 60 * 1000;
+ const hours = Math.floor(milliseconds / (60 * 60 * 1000));
+ milliseconds %= 60 * 60 * 1000;
+ const minutes = Math.floor(milliseconds / (60 * 1000));
+
+ if (days > 0) {
+ return `${days}d ${hours}h ${minutes}m`;
+ } else if (hours > 0) {
+ return `${hours}h ${minutes}m`;
+ } else {
+ return `${minutes}m`;
+ }
+ }
+}
diff --git a/frontend/src/app/login/login.component.html b/frontend/src/app/login/login.component.html
new file mode 100644
index 0000000..2c5ff3f
--- /dev/null
+++ b/frontend/src/app/login/login.component.html
@@ -0,0 +1,46 @@
+;
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ imports: [LoginComponent]
+ })
+ .compileComponents();
+
+ fixture = TestBed.createComponent(LoginComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/frontend/src/app/login/login.component.ts b/frontend/src/app/login/login.component.ts
new file mode 100644
index 0000000..1c1ead5
--- /dev/null
+++ b/frontend/src/app/login/login.component.ts
@@ -0,0 +1,62 @@
+import { Component } from '@angular/core';
+import {DevelopmentStore} from "../../store/DevelopmentStore";
+import {FormsModule} from "@angular/forms";
+import axios from "axios";
+import {NgClass, NgIf} from "@angular/common";
+import {AuthStore} from "../../store/authStore";
+import {firstValueFrom} from "rxjs";
+import {Router} from "@angular/router";
+
+@Component({
+ selector: 'app-login',
+ standalone: true,
+ imports: [
+ FormsModule,
+ NgClass,
+ NgIf
+ ],
+ templateUrl: './login.component.html',
+ styleUrl: './login.component.scss'
+})
+export class LoginComponent {
+ inputUsername: string = "";
+ inputPassword: string = "";
+ loginFailed: boolean = false;
+ loginSuccessful: boolean = false;
+
+ constructor(private developmentStore: DevelopmentStore, private authStore: AuthStore, private router: Router) {
+ }
+
+ tryToLogin() {
+ console.log("Trying to login with username: " + this.inputUsername + " and password: " + this.inputPassword);
+
+ axios({
+ method: 'post',
+ url: this.developmentStore.getBaseUrl() + 'api/v1/auth/login',
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: {
+ username: this.inputUsername,
+ password: this.inputPassword
+ }
+ })
+ .then(async response => {
+ console.log(response);
+ console.log(response.data);
+ if(response.data.token) {
+ this.loginSuccessful = true;
+ this.authStore.setToken(response.data.token);
+ this.authStore.setUsername(this.inputUsername);
+
+ //timeout
+ setTimeout(() => {
+ this.router.navigate(['/secure/administration']);
+ }, 500);
+ }
+ })
+ .catch(error => {
+ this.loginFailed = true;
+ });
+ }
+}
diff --git a/frontend/src/app/relative-time.pipe.spec.ts b/frontend/src/app/relative-time.pipe.spec.ts
new file mode 100644
index 0000000..ba62c09
--- /dev/null
+++ b/frontend/src/app/relative-time.pipe.spec.ts
@@ -0,0 +1,8 @@
+import { RelativeTimePipe } from './relative-time.pipe';
+
+describe('RelativeTimePipe', () => {
+ it('create an instance', () => {
+ const pipe = new RelativeTimePipe();
+ expect(pipe).toBeTruthy();
+ });
+});
diff --git a/frontend/src/app/relative-time.pipe.ts b/frontend/src/app/relative-time.pipe.ts
new file mode 100644
index 0000000..9016478
--- /dev/null
+++ b/frontend/src/app/relative-time.pipe.ts
@@ -0,0 +1,45 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+ name: 'relativeTime',
+ standalone: true,
+ pure: false
+})
+export class RelativeTimePipe implements PipeTransform {
+
+ transform(value: string): string {
+ if (!value) {
+ return '';
+ }
+
+ const now = new Date();
+ const past = new Date(value);
+ const elapsed = now.getTime() - past.getTime();
+
+ const msPerSecond = 1000;
+ const msPerMinute = msPerSecond * 60;
+ const msPerHour = msPerMinute * 60;
+ const msPerDay = msPerHour * 24;
+ const msPerWeek = msPerDay * 7;
+ const msPerMonth = msPerDay * 30;
+ const msPerYear = msPerDay * 365;
+
+ if (elapsed < msPerSecond) {
+ return 'just now';
+ } else if (elapsed < msPerMinute) {
+ return `${Math.round(elapsed / msPerSecond)} seconds ago`;
+ } else if (elapsed < msPerHour) {
+ return `${Math.round(elapsed / msPerMinute)} minutes ago`;
+ } else if (elapsed < msPerDay) {
+ return `${Math.round(elapsed / msPerHour)} hours ago`;
+ } else if (elapsed < msPerWeek) {
+ return `${Math.round(elapsed / msPerDay)} days ago`;
+ } else if (elapsed < msPerMonth) {
+ return `${Math.round(elapsed / msPerWeek)} weeks ago`;
+ } else if (elapsed < msPerYear) {
+ return `${Math.round(elapsed / msPerMonth)} months ago`;
+ } else {
+ return `${Math.round(elapsed / msPerYear)} years ago`;
+ }
+ }
+}
diff --git a/frontend/src/app/upload/upload.component.ts b/frontend/src/app/upload/upload.component.ts
index df1cce8..a62099a 100644
--- a/frontend/src/app/upload/upload.component.ts
+++ b/frontend/src/app/upload/upload.component.ts
@@ -97,7 +97,7 @@ export class UploadComponent {
}
};
- axios.post(this.developmentStore.getBaseUrl() + 'api/v1/upload', formData, config)
+ axios.post(this.developmentStore.getBaseUrl() + 'api/v1/public/upload', formData, config)
.then(response => {
console.log('Upload completed successfully!');
console.log(response.data);
@@ -119,7 +119,7 @@ export class UploadComponent {
passwordUrlPart = `&password=${fileDetails.password}`;
}
const downloadUrl = `${baseUrl}download?fileId=${fileId}${passwordUrlPart}`;
- const deleteUrl = `${baseUrl}api/v1/deletefile?fileId=${fileId}${passwordUrlPart}`;
+ const deleteUrl = `${baseUrl}api/v1/public/deletefile?fileId=${fileId}${passwordUrlPart}`;
const statusUrl = `${baseUrl}status?fileId=${fileId}${passwordUrlPart}`;
return {
downloadUrl,
@@ -151,7 +151,7 @@ export class UploadComponent {
axios({
method: 'post',
- url: this.developmentStore.getBaseUrl() + 'api/v1/upload-speed-test',
+ url: this.developmentStore.getBaseUrl() + 'api/v1/public/upload-speed-test',
data: uint8View,
headers: {
'Content-Type': 'application/octet-stream',
diff --git a/frontend/src/store/authStore.ts b/frontend/src/store/authStore.ts
new file mode 100644
index 0000000..577ad1a
--- /dev/null
+++ b/frontend/src/store/authStore.ts
@@ -0,0 +1,40 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+interface AuthStoreState {
+ username: string;
+ token: string;
+}
+
+@Injectable({
+ providedIn: 'root'
+})
+export class AuthStore {
+ private state: BehaviorSubject = new BehaviorSubject({
+ username: "",
+ token: "",
+ });
+
+ // Getter for username
+ get username$() {
+ return this.state.asObservable().pipe(map(state => state.username));
+ }
+
+ // Getter for token
+ get token$() {
+ return this.state.asObservable().pipe(map(state => state.token));
+ }
+
+ // Mutation for username
+ setUsername(username: string) {
+ const currentState = this.state.getValue();
+ this.state.next({ ...currentState, username });
+ }
+
+ // Mutation for token
+ setToken(token: string) {
+ const currentState = this.state.getValue();
+ this.state.next({ ...currentState, token });
+ }
+}
diff --git a/src/main/java/de/w665/sharepulse/SharepulseApplication.java b/src/main/java/de/w665/sharepulse/SharepulseApplication.java
index 2c4ac58..2f2af61 100644
--- a/src/main/java/de/w665/sharepulse/SharepulseApplication.java
+++ b/src/main/java/de/w665/sharepulse/SharepulseApplication.java
@@ -3,10 +3,15 @@ package de.w665.sharepulse;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import java.util.Date;
+
@SpringBootApplication
public class SharepulseApplication {
+ public static Date startTime;
+
public static void main(String[] args) {
+ startTime = new Date();
SpringApplication.run(SharepulseApplication.class, args);
}
diff --git a/src/main/java/de/w665/sharepulse/config/CorsConfig.java b/src/main/java/de/w665/sharepulse/config/CorsConfig.java
index 37f5971..09468b7 100644
--- a/src/main/java/de/w665/sharepulse/config/CorsConfig.java
+++ b/src/main/java/de/w665/sharepulse/config/CorsConfig.java
@@ -17,6 +17,7 @@ public class CorsConfig implements WebMvcConfigurer {
registry.addMapping("/api/v1/**")
.allowedOrigins("*")
.allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
- .allowedHeaders("*");
+ .allowedHeaders("*")
+ .maxAge(3600);
}
}
diff --git a/src/main/java/de/w665/sharepulse/config/CustomAuthenticationFilter.java b/src/main/java/de/w665/sharepulse/config/CustomAuthenticationFilter.java
new file mode 100644
index 0000000..3defc5a
--- /dev/null
+++ b/src/main/java/de/w665/sharepulse/config/CustomAuthenticationFilter.java
@@ -0,0 +1,17 @@
+package de.w665.sharepulse.config;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import org.springframework.web.filter.GenericFilterBean;
+
+import java.io.IOException;
+
+public class CustomAuthenticationFilter extends GenericFilterBean {
+ @Override
+ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+ // Custom logic here
+ filterChain.doFilter(servletRequest, servletResponse);
+ }
+}
diff --git a/src/main/java/de/w665/sharepulse/config/MvcConfig.java b/src/main/java/de/w665/sharepulse/config/MvcConfig.java
index 7e1d869..3e3aac3 100644
--- a/src/main/java/de/w665/sharepulse/config/MvcConfig.java
+++ b/src/main/java/de/w665/sharepulse/config/MvcConfig.java
@@ -16,6 +16,8 @@ public class MvcConfig implements WebMvcConfigurer {
registry.addViewController("/upload").setViewName("forward:/index.html");
registry.addViewController("/credits").setViewName("forward:/index.html");
registry.addViewController("/licenses").setViewName("forward:/index.html");
+ registry.addViewController("/login").setViewName("forward:/index.html");
+ registry.addViewController("/secure/administration").setViewName("forward:/index.html");
}
}
diff --git a/src/main/java/de/w665/sharepulse/config/SecurityConfig.java b/src/main/java/de/w665/sharepulse/config/SecurityConfig.java
new file mode 100644
index 0000000..de39681
--- /dev/null
+++ b/src/main/java/de/w665/sharepulse/config/SecurityConfig.java
@@ -0,0 +1,54 @@
+package de.w665.sharepulse.config;
+
+import de.w665.sharepulse.rest.security.JwtAuthenticationFilter;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.LogoutConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+@Configuration
+@EnableWebSecurity
+public class SecurityConfig {
+
+ private final JwtAuthenticationFilter jwtAuthenticationFilter;
+
+ public SecurityConfig(JwtAuthenticationFilter jwtAuthenticationFilter) {
+ this.jwtAuthenticationFilter = jwtAuthenticationFilter;
+ }
+
+ // This bean is required for Spring Security, though it's not used in this project
+ // Prevents Spring from generating a default password
+ @Bean
+ UserDetailsService emptyDetailsService() {
+ return username -> { throw new UsernameNotFoundException("no local users, only JWT tokens allowed"); };
+ }
+
+ @Bean
+ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+ http
+ .csrf(csrf -> csrf.ignoringRequestMatchers("/api/v1/**")) // Disable CSRF for API routes
+ .sessionManagement(sessionManagement -> sessionManagement
+ .sessionCreationPolicy(SessionCreationPolicy.STATELESS) // No session will be created by Spring Security
+ )
+ .authorizeHttpRequests(authorize -> authorize
+ .requestMatchers("/api/v1/secure/**").authenticated() // Secure these endpoints
+ .anyRequest().permitAll() // All other requests are allowed without authentication
+ )
+ .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class) // Apply JWT filter
+ .logout(LogoutConfigurer::permitAll)
+ .rememberMe(Customizer.withDefaults());
+
+ return http.build();
+ }
+
+
+}
+
+// TODO: Fix the security configuration to allow public access to unsecured endpoints
diff --git a/src/main/java/de/w665/sharepulse/db/RethinkDBService.java b/src/main/java/de/w665/sharepulse/db/RethinkDBService.java
index da1a8d0..b065186 100644
--- a/src/main/java/de/w665/sharepulse/db/RethinkDBService.java
+++ b/src/main/java/de/w665/sharepulse/db/RethinkDBService.java
@@ -3,33 +3,44 @@ package de.w665.sharepulse.db;
import com.rethinkdb.RethinkDB;
import com.rethinkdb.gen.exc.ReqlOpFailedError;
import com.rethinkdb.net.Connection;
+import de.w665.sharepulse.db.repo.UserRepository;
+import de.w665.sharepulse.model.User;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.PreDestroy;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
+import java.util.Optional;
+
@Slf4j
@Service
public class RethinkDBService {
private final RethinkDBConfig config;
-
private final RethinkDB r;
private final Connection connection;
+ private final UserRepository userRepository;
@Value("${sharepulse.auto-reset-on-startup}")
private boolean autoResetOnStartup;
+ @Value("${sharepulse.management.user.username}")
+ private String defaultUsername;
+ @Value("${sharepulse.management.user.password}")
+ private String defaultPassword;
+
+ private final BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
@Autowired
- public RethinkDBService(RethinkDBConfig config, RethinkDBConnector connector) {
+ public RethinkDBService(RethinkDBConfig config, RethinkDBConnector connector, UserRepository userRepository) {
this.config = config;
-
// mapping to private vars for easier access
this.r = connector.getR();
this.connection = connector.getConnection();
+ this.userRepository = userRepository;
}
@PostConstruct
@@ -81,9 +92,59 @@ public class RethinkDBService {
log.debug("Table 'expired_file_uploads' cleared successfully.");
}
}
+
+ // rethinkdb check if table users exists
+ try {
+ r.db(config.getDatabase()).tableCreate("users").run(connection).stream();
+ log.debug("Table 'users' created successfully.");
+ } catch (ReqlOpFailedError e) {
+ log.debug("Table 'users' already exists.");
+ if(autoResetOnStartup) {
+ log.debug("Clearing content...");
+ r.db(config.getDatabase()).table("users").delete().run(connection);
+ log.debug("Table 'users' cleared successfully.");
+ }
+ }
+
+ // rethinkdb check if table user_logins exists
+ try {
+ r.db(config.getDatabase()).tableCreate("user_logins").run(connection).stream();
+ log.debug("Table 'user_logins' created successfully.");
+ } catch (ReqlOpFailedError e) {
+ log.debug("Table 'user_logins' already exists.");
+ if(autoResetOnStartup) {
+ log.debug("Clearing content...");
+ r.db(config.getDatabase()).table("user_logins").delete().run(connection);
+ log.debug("Table 'user_logins' cleared successfully.");
+ }
+ } finally {
+ try {
+ r.db(config.getDatabase()).table("user_logins").indexCreate("loginTime").run(connection);
+ log.debug("Secondary index 'loginTime' on table 'user_logins' successfully created.");
+ } catch (ReqlOpFailedError e) {
+ log.debug("Secondary index 'loginTime' already exists.");
+ } finally {
+ r.db(config.getDatabase()).table("user_logins").indexWait("loginTime").run(connection);
+ }
+ }
+
+ initializeAdminUser();
+
log.info("Database ready for operation!");
}
+ private void initializeAdminUser() {
+ Optional adminUser = userRepository.retrieveUserByUsername("admin");
+ if(adminUser.isEmpty()) {
+ User user = new User();
+ user.setUsername(defaultUsername);
+ user.setPassword(passwordEncoder.encode(defaultPassword));
+ user.setRole("ADMIN");
+ userRepository.insertUser(user);
+ log.debug("Admin user created with default credentials. Username: admin, Password: admin");
+ }
+ }
+
@PreDestroy
public void close() {
if (connection != null) {
diff --git a/src/main/java/de/w665/sharepulse/db/repo/ExpiredFileUploadRepository.java b/src/main/java/de/w665/sharepulse/db/repo/ExpiredFileUploadRepository.java
index dae75ce..d211bf3 100644
--- a/src/main/java/de/w665/sharepulse/db/repo/ExpiredFileUploadRepository.java
+++ b/src/main/java/de/w665/sharepulse/db/repo/ExpiredFileUploadRepository.java
@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import java.lang.reflect.Type;
+import java.util.List;
import java.util.Map;
@Repository
@@ -38,4 +39,17 @@ public class ExpiredFileUploadRepository {
r.db("sharepulse").table("expired_file_uploads").insert(map).run(connection);
}
+
+ public void deleteExpiredFileUpload(FileUpload fileUpload) {
+ r.db("sharepulse").table("expired_file_uploads")
+ .filter(r.hashMap("fileId", fileUpload.getFileId()))
+ .delete()
+ .run(connection);
+ }
+
+ public List findAll() {
+ return r.db("sharepulse").table("expired_file_uploads")
+ .run(connection, FileUpload.class)
+ .toList();
+ }
}
diff --git a/src/main/java/de/w665/sharepulse/db/repo/FileUploadRepository.java b/src/main/java/de/w665/sharepulse/db/repo/FileUploadRepository.java
index d68b595..27db86b 100644
--- a/src/main/java/de/w665/sharepulse/db/repo/FileUploadRepository.java
+++ b/src/main/java/de/w665/sharepulse/db/repo/FileUploadRepository.java
@@ -36,7 +36,7 @@ public class FileUploadRepository {
Type type = new TypeToken>(){}.getType();
Map map = gson.fromJson(json, type);
- long uploadDateTimestamp = fileUpload.getUploadDate().getTime() / 1000;
+ long uploadDateTimestamp = fileUpload.getUploadDate().getTime();
map.put("uploadDate", uploadDateTimestamp);
r.db("sharepulse").table("file_uploads").insert(map).run(connection);
@@ -61,7 +61,7 @@ public class FileUploadRepository {
Type type = new TypeToken>(){}.getType();
Map map = gson.fromJson(json, type);
- long uploadDateTimestamp = updatedFileUpload.getUploadDate().getTime() / 1000;
+ long uploadDateTimestamp = updatedFileUpload.getUploadDate().getTime();
map.put("uploadDate", uploadDateTimestamp);
String fileId = updatedFileUpload.getFileId();
@@ -79,15 +79,21 @@ public class FileUploadRepository {
.run(connection);
}
- public List getAllExpiredFileUploads() {
+ // This query filters all file uploads that are older than 24 hours from the file_uplaods table (not the expired_file_uploads table)
+ public List findAllExpiredActiveFileUploads() {
long timestamp = getOneMinuteAgoTimestamp();
- List olderFiles = r.db("sharepulse").table("file_uploads")
+ return r.db("sharepulse").table("file_uploads")
.filter(row -> row.g("uploadDate").lt(timestamp))
.run(connection, FileUpload.class)
.toList();
- return olderFiles;
+ }
+
+ public List findAll() {
+ return r.db("sharepulse").table("file_uploads")
+ .run(connection, FileUpload.class)
+ .toList();
}
private long get24HoursAgoTimestamp() {
diff --git a/src/main/java/de/w665/sharepulse/db/repo/UserLoginRepository.java b/src/main/java/de/w665/sharepulse/db/repo/UserLoginRepository.java
new file mode 100644
index 0000000..97f111c
--- /dev/null
+++ b/src/main/java/de/w665/sharepulse/db/repo/UserLoginRepository.java
@@ -0,0 +1,67 @@
+package de.w665.sharepulse.db.repo;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.rethinkdb.RethinkDB;
+import com.rethinkdb.net.Connection;
+import com.rethinkdb.net.Result;
+import de.w665.sharepulse.db.RethinkDBConfig;
+import de.w665.sharepulse.db.RethinkDBConnector;
+import de.w665.sharepulse.model.UserLogin;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Slf4j
+@Repository
+public class UserLoginRepository {
+ private final RethinkDB r;
+ private final Connection connection;
+ private final RethinkDBConfig config;
+ private final String TABLE_NAME = "user_logins";
+
+ private final Gson gson = new Gson();
+ private final ObjectMapper mapper = new ObjectMapper();
+
+
+ @Autowired
+ public UserLoginRepository(RethinkDBConnector connector, RethinkDBConfig config) {
+ this.r = connector.getR();
+ this.connection = connector.getConnection();
+ this.config = config;
+ }
+
+ public void insertUserLogin(UserLogin userLogin) {
+ String uuid = r.uuid().run(connection, String.class).first();
+ userLogin.setId(uuid);
+ r.db(config.getDatabase()).table(TABLE_NAME).insert(userLogin).run(connection);
+ }
+
+ public UserLogin getLastLogin(String userId) {
+ // Get the second most recent login (the most recent is the current one)
+ Result result = r.db(config.getDatabase()).table(TABLE_NAME)
+ .orderBy().optArg("index", r.desc("loginTime"))
+ .filter(r.hashMap("userId", userId))
+ .skip(1).limit(1)
+ .run(connection, UserLogin.class);
+ // Return the second most recent login if exists
+ return result.hasNext() ? result.next() : null;
+ }
+
+ public List getUserLogins(String userId) {
+ Result result = r.db(config.getDatabase()).table(TABLE_NAME)
+ .orderBy().optArg("index", r.desc("loginTime"))
+ .filter(r.hashMap("userId", userId))
+ .run(connection, UserLogin.class);
+ return result.toList();
+ }
+
+ public void deleteAllUserLogins(String userId) {
+ r.db(config.getDatabase()).table(TABLE_NAME)
+ .filter(r.hashMap("userId", userId))
+ .delete()
+ .run(connection);
+ }
+}
diff --git a/src/main/java/de/w665/sharepulse/db/repo/UserRepository.java b/src/main/java/de/w665/sharepulse/db/repo/UserRepository.java
new file mode 100644
index 0000000..bad97c4
--- /dev/null
+++ b/src/main/java/de/w665/sharepulse/db/repo/UserRepository.java
@@ -0,0 +1,55 @@
+package de.w665.sharepulse.db.repo;
+
+import com.rethinkdb.RethinkDB;
+import com.rethinkdb.net.Connection;
+import de.w665.sharepulse.db.RethinkDBConfig;
+import de.w665.sharepulse.db.RethinkDBConnector;
+import de.w665.sharepulse.model.User;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+import java.util.*;
+
+@Repository
+public class UserRepository {
+ private final RethinkDB r;
+ private final Connection connection;
+ private final RethinkDBConfig config;
+ @Autowired
+ public UserRepository(RethinkDBConnector connector, RethinkDBConfig config) {
+ this.r = connector.getR();
+ this.connection = connector.getConnection();
+ this.config = config;
+ }
+
+ public Optional retrieveUserByUsername(String username) {
+ try {
+ User user = r.db(config.getDatabase()).table("users")
+ .filter(r.hashMap("username", username))
+ .run(connection, User.class)
+ .next();
+ return Optional.ofNullable(user);
+ } catch (NoSuchElementException e) {
+ return Optional.empty();
+ }
+ }
+
+ public void updateLastLoginForUser(String username, Date lastLogin) {
+ r.db(config.getDatabase()).table("users")
+ .filter(r.hashMap("username", username))
+ .update(r.hashMap("lastLogin", lastLogin.getTime()))
+ .run(connection);
+ }
+
+ public void updateUser(User user) {
+ r.db(config.getDatabase()).table("users")
+ .filter(r.hashMap("id", user.getId()))
+ .update(user)
+ .run(connection);
+ }
+
+ public void insertUser(User user) {
+ String optionalUuid = r.uuid().run(connection, String.class).first();
+ user.setId(optionalUuid);
+ r.db(config.getDatabase()).table("users").insert(user).run(connection);
+ }
+}
diff --git a/src/main/java/de/w665/sharepulse/model/FileUpload.java b/src/main/java/de/w665/sharepulse/model/FileUpload.java
index 6afde28..91d88df 100644
--- a/src/main/java/de/w665/sharepulse/model/FileUpload.java
+++ b/src/main/java/de/w665/sharepulse/model/FileUpload.java
@@ -18,6 +18,7 @@ public class FileUpload {
private String fileName;
private long fileSize;
private boolean singleDownload;
+ private boolean disabled;
@JsonFormat(timezone = "ETC")
private Date uploadDate;
private String uploadedByIpAddress;
diff --git a/src/main/java/de/w665/sharepulse/model/User.java b/src/main/java/de/w665/sharepulse/model/User.java
new file mode 100644
index 0000000..0bb9576
--- /dev/null
+++ b/src/main/java/de/w665/sharepulse/model/User.java
@@ -0,0 +1,19 @@
+package de.w665.sharepulse.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.*;
+
+import java.util.Date;
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+public class User {
+ private String id; // ID is auto mapped by RethinkDB
+ private String username;
+ private String password;
+ private String email;
+ private String role;
+}
diff --git a/src/main/java/de/w665/sharepulse/model/UserLogin.java b/src/main/java/de/w665/sharepulse/model/UserLogin.java
new file mode 100644
index 0000000..854f6cc
--- /dev/null
+++ b/src/main/java/de/w665/sharepulse/model/UserLogin.java
@@ -0,0 +1,21 @@
+package de.w665.sharepulse.model;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserLogin {
+ String id;
+ String userId;
+ @JsonFormat(timezone = "ETC")
+ Date loginTime;
+ String loginIp;
+}
diff --git a/src/main/java/de/w665/sharepulse/rest/ApiRestController.java b/src/main/java/de/w665/sharepulse/rest/ApiRestController.java
index 828a67e..508b4ba 100644
--- a/src/main/java/de/w665/sharepulse/rest/ApiRestController.java
+++ b/src/main/java/de/w665/sharepulse/rest/ApiRestController.java
@@ -4,6 +4,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
-@RequestMapping("/api/v1")
+@RequestMapping("/api/v1/public")
public abstract class ApiRestController {
}
diff --git a/src/main/java/de/w665/sharepulse/rest/ErrorRestController.java b/src/main/java/de/w665/sharepulse/rest/ErrorRestController.java
index 487a54e..c15a5e1 100644
--- a/src/main/java/de/w665/sharepulse/rest/ErrorRestController.java
+++ b/src/main/java/de/w665/sharepulse/rest/ErrorRestController.java
@@ -1,6 +1,8 @@
package de.w665.sharepulse.rest;
import org.springframework.boot.web.servlet.error.ErrorController;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -10,10 +12,19 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
public class ErrorRestController implements ErrorController {
@RequestMapping("/error")
- public String handleError() {
- return "";
+ "" +
+ "
+
diff --git a/frontend/src/app/login/login.component.scss b/frontend/src/app/login/login.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/frontend/src/app/login/login.component.spec.ts b/frontend/src/app/login/login.component.spec.ts
new file mode 100644
index 0000000..1e19e5d
--- /dev/null
+++ b/frontend/src/app/login/login.component.spec.ts
@@ -0,0 +1,23 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { LoginComponent } from './login.component';
+
+describe('LoginComponent', () => {
+ let component: LoginComponent;
+ let fixture: ComponentFixture
+
+Login to SharePulse
+ ++ Login to SharePulse to access the administrative dashboard and manage uploaded files. Please note that registration is disabled. +
+ +You've reached the default error page.
" + + "This could be caused by several reasons:
" + + "- " +
+ "
- The page you are looking for does not exist. " + + "
- The page you are looking for is not accessible. " + + "
- The page you are looking for is not available at the moment. " + + "
- The page you are looking for is not accessible without authentication. " + + "