From 9b7748571e17846011bfbb9ce75713d1a6935033 Mon Sep 17 00:00:00 2001 From: Vladislav Kopnin Date: Thu, 10 Sep 2026 19:46:13 +0300 Subject: [PATCH] Initial commit: LMS microservices scaffold - Gradle multi-module: libs/{common-http,security-jwt,markdown,test-support}, services/{identity,academic,progress,gateway}, web (Thymeleaf+htmx) - identity-service: JWT auth (RSA), accounts, students, groups, enrollment, import from XLSX/CSV, credentials export, password reset - academic-service: lab import from JSON/zip (markdown + YAML + variants), levels, API - progress-service: schema for student levels and variant assignments - gateway: Spring Cloud Gateway, JWT validation, route propagation - web: Server-side UI with flex/footer layout, light/dark theme toggle, admin dashboard, groups CRUD, student portal placeholder - docker-compose: PostgreSQL 18 - Tests: identity smoke test with Testcontainers --- .env.example | 8 + .gitignore | 53 ++++ README.md | 57 +++++ buildSrc/build.gradle.kts | 16 ++ buildSrc/settings.gradle.kts | 17 ++ .../main/kotlin/lms.spring-boot.gradle.kts | 31 +++ .../main/kotlin/lms.spring-library.gradle.kts | 24 ++ docker-compose.yml | 22 ++ gradle.properties | 8 + gradle/libs.versions.toml | 80 ++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 234 ++++++++++++++++++ gradlew.bat | 89 +++++++ libs/common-http/build.gradle.kts | 10 + .../main/kotlin/ru/ysu/lms/common/ApiError.kt | 21 ++ .../src/main/kotlin/ru/ysu/lms/common/Ids.kt | 21 ++ .../lms/common/LmsCommonAutoConfiguration.kt | 13 + .../kotlin/ru/ysu/lms/common/LmsException.kt | 29 +++ .../ru/ysu/lms/common/LmsExceptionHandler.kt | 37 +++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + libs/markdown/build.gradle.kts | 12 + .../markdown/LmsMarkdownAutoConfiguration.kt | 16 ++ .../ru/ysu/lms/markdown/MarkdownProperties.kt | 9 + .../ru/ysu/lms/markdown/MarkdownRenderer.kt | 113 +++++++++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + libs/security-jwt/build.gradle.kts | 11 + .../ru/ysu/lms/security/JwtPrincipal.kt | 15 ++ .../ru/ysu/lms/security/JwtProperties.kt | 16 ++ .../security/LmsSecurityAutoConfiguration.kt | 48 ++++ .../kotlin/ru/ysu/lms/security/RsaKeys.kt | 32 +++ ...ot.autoconfigure.AutoConfiguration.imports | 1 + libs/test-support/build.gradle.kts | 13 + .../ru/ysu/lms/test/DatabaseTestSupport.kt | 8 + services/academic-service/build.gradle.kts | 30 +++ .../academic/AcademicServiceApplication.kt | 11 + .../lms/academic/controller/LabController.kt | 33 +++ .../kotlin/ru/ysu/lms/academic/domain/Lab.kt | 40 +++ .../ru/ysu/lms/academic/domain/LabLevel.kt | 31 +++ .../ru/ysu/lms/academic/domain/Semester.kt | 21 ++ .../ru/ysu/lms/academic/domain/Variant.kt | 32 +++ .../kotlin/ru/ysu/lms/academic/lab/LabDtos.kt | 80 ++++++ .../ysu/lms/academic/lab/LabImportParser.kt | 165 ++++++++++++ .../ru/ysu/lms/academic/lab/LabService.kt | 137 ++++++++++ .../ru/ysu/lms/academic/repo/LabRepository.kt | 9 + .../lms/academic/repo/SemesterRepository.kt | 9 + .../lms/academic/repo/VariantRepository.kt | 14 ++ .../lms/academic/security/SecurityConfig.kt | 60 +++++ .../src/main/resources/application.yml | 37 +++ .../main/resources/db/migration/V1__init.sql | 2 + .../resources/db/migration/V2__schema.sql | 88 +++++++ .../main/resources/db/migration/V3__seed.sql | 4 + services/gateway/build.gradle.kts | 19 ++ .../ru/ysu/lms/gateway/GatewayApplication.kt | 11 + .../security/JwtAuthenticationFilter.kt | 66 +++++ .../src/main/resources/application.yml | 37 +++ services/identity-service/build.gradle.kts | 31 +++ .../identity/IdentityServiceApplication.kt | 14 ++ .../ysu/lms/identity/auth/AuthController.kt | 50 ++++ .../ru/ysu/lms/identity/auth/AuthDtos.kt | 45 ++++ .../ru/ysu/lms/identity/auth/AuthService.kt | 133 ++++++++++ .../ru/ysu/lms/identity/auth/Passwords.kt | 13 + .../ru/ysu/lms/identity/domain/Account.kt | 41 +++ .../ru/ysu/lms/identity/domain/Enrollment.kt | 30 +++ .../ru/ysu/lms/identity/domain/GroupEntity.kt | 25 ++ .../ru/ysu/lms/identity/domain/Setting.kt | 17 ++ .../ru/ysu/lms/identity/domain/Student.kt | 47 ++++ .../lms/identity/repo/AccountRepository.kt | 13 + .../lms/identity/repo/EnrollmentRepository.kt | 21 ++ .../ysu/lms/identity/repo/GroupRepository.kt | 11 + .../lms/identity/repo/SettingRepository.kt | 6 + .../lms/identity/repo/StudentRepository.kt | 10 + .../identity/roster/CredentialsExporter.kt | 53 ++++ .../lms/identity/roster/GroupController.kt | 58 +++++ .../ysu/lms/identity/roster/GroupService.kt | 175 +++++++++++++ .../ru/ysu/lms/identity/roster/RosterDtos.kt | 55 ++++ .../lms/identity/roster/StudentController.kt | 18 ++ .../identity/roster/StudentImportParser.kt | 160 ++++++++++++ .../ru/ysu/lms/identity/security/JwtConfig.kt | 37 +++ .../ysu/lms/identity/security/JwtKeyStore.kt | 50 ++++ .../lms/identity/security/SecurityConfig.kt | 62 +++++ .../src/main/resources/application.yml | 37 +++ .../main/resources/db/migration/V1__init.sql | 2 + .../resources/db/migration/V2__accounts.sql | 45 ++++ .../ru/ysu/lms/identity/IdentitySmokeTest.kt | 62 +++++ services/progress-service/build.gradle.kts | 26 ++ .../progress/ProgressServiceApplication.kt | 12 + .../lms/progress/domain/VariantAssignment.kt | 33 +++ .../lms/progress/security/SecurityConfig.kt | 38 +++ .../src/main/resources/application.yml | 30 +++ .../main/resources/db/migration/V1__init.sql | 2 + .../resources/db/migration/V2__schema.sql | 22 ++ settings.gradle.kts | 31 +++ web/build.gradle.kts | 23 ++ .../kotlin/ru/ysu/lms/web/WebApplication.kt | 11 + .../ru/ysu/lms/web/admin/AdminController.kt | 124 ++++++++++ .../kotlin/ru/ysu/lms/web/api/ApiClient.kt | 149 +++++++++++ .../main/kotlin/ru/ysu/lms/web/api/ApiDtos.kt | 78 ++++++ .../kotlin/ru/ysu/lms/web/api/ApiException.kt | 6 + .../ru/ysu/lms/web/auth/AuthPageController.kt | 126 ++++++++++ .../kotlin/ru/ysu/lms/web/config/WebConfig.kt | 34 +++ .../ru/ysu/lms/web/config/WebErrorAdvice.kt | 19 ++ .../ysu/lms/web/session/AdminInterceptor.kt | 23 ++ .../ru/ysu/lms/web/session/AuthInterceptor.kt | 29 +++ .../ru/ysu/lms/web/session/SessionUser.kt | 17 ++ .../ysu/lms/web/student/StudentController.kt | 13 + web/src/main/resources/application.yml | 18 ++ web/src/main/resources/static/css/app.css | 81 ++++++ web/src/main/resources/static/js/htmx.min.js | 1 + .../resources/templates/admin/dashboard.html | 48 ++++ .../main/resources/templates/admin/group.html | 83 +++++++ .../resources/templates/admin/groups.html | 62 +++++ .../resources/templates/change_password.html | 33 +++ web/src/main/resources/templates/error.html | 14 ++ .../resources/templates/fragments/base.html | 44 ++++ web/src/main/resources/templates/index.html | 20 ++ web/src/main/resources/templates/login.html | 32 +++ web/src/main/resources/templates/setup.html | 35 +++ .../templates/student/dashboard.html | 25 ++ 119 files changed, 4671 insertions(+) create mode 100644 .env.example create mode 100644 .gitignore create mode 100644 README.md create mode 100644 buildSrc/build.gradle.kts create mode 100644 buildSrc/settings.gradle.kts create mode 100644 buildSrc/src/main/kotlin/lms.spring-boot.gradle.kts create mode 100644 buildSrc/src/main/kotlin/lms.spring-library.gradle.kts create mode 100644 docker-compose.yml create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 libs/common-http/build.gradle.kts create mode 100644 libs/common-http/src/main/kotlin/ru/ysu/lms/common/ApiError.kt create mode 100644 libs/common-http/src/main/kotlin/ru/ysu/lms/common/Ids.kt create mode 100644 libs/common-http/src/main/kotlin/ru/ysu/lms/common/LmsCommonAutoConfiguration.kt create mode 100644 libs/common-http/src/main/kotlin/ru/ysu/lms/common/LmsException.kt create mode 100644 libs/common-http/src/main/kotlin/ru/ysu/lms/common/LmsExceptionHandler.kt create mode 100644 libs/common-http/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 libs/markdown/build.gradle.kts create mode 100644 libs/markdown/src/main/kotlin/ru/ysu/lms/markdown/LmsMarkdownAutoConfiguration.kt create mode 100644 libs/markdown/src/main/kotlin/ru/ysu/lms/markdown/MarkdownProperties.kt create mode 100644 libs/markdown/src/main/kotlin/ru/ysu/lms/markdown/MarkdownRenderer.kt create mode 100644 libs/markdown/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 libs/security-jwt/build.gradle.kts create mode 100644 libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/JwtPrincipal.kt create mode 100644 libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/JwtProperties.kt create mode 100644 libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/LmsSecurityAutoConfiguration.kt create mode 100644 libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/RsaKeys.kt create mode 100644 libs/security-jwt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 libs/test-support/build.gradle.kts create mode 100644 libs/test-support/src/main/kotlin/ru/ysu/lms/test/DatabaseTestSupport.kt create mode 100644 services/academic-service/build.gradle.kts create mode 100644 services/academic-service/src/main/kotlin/ru/ysu/lms/academic/AcademicServiceApplication.kt create mode 100644 services/academic-service/src/main/kotlin/ru/ysu/lms/academic/controller/LabController.kt create mode 100644 services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/Lab.kt create mode 100644 services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/LabLevel.kt create mode 100644 services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/Semester.kt create mode 100644 services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/Variant.kt create mode 100644 services/academic-service/src/main/kotlin/ru/ysu/lms/academic/lab/LabDtos.kt create mode 100644 services/academic-service/src/main/kotlin/ru/ysu/lms/academic/lab/LabImportParser.kt create mode 100644 services/academic-service/src/main/kotlin/ru/ysu/lms/academic/lab/LabService.kt create mode 100644 services/academic-service/src/main/kotlin/ru/ysu/lms/academic/repo/LabRepository.kt create mode 100644 services/academic-service/src/main/kotlin/ru/ysu/lms/academic/repo/SemesterRepository.kt create mode 100644 services/academic-service/src/main/kotlin/ru/ysu/lms/academic/repo/VariantRepository.kt create mode 100644 services/academic-service/src/main/kotlin/ru/ysu/lms/academic/security/SecurityConfig.kt create mode 100644 services/academic-service/src/main/resources/application.yml create mode 100644 services/academic-service/src/main/resources/db/migration/V1__init.sql create mode 100644 services/academic-service/src/main/resources/db/migration/V2__schema.sql create mode 100644 services/academic-service/src/main/resources/db/migration/V3__seed.sql create mode 100644 services/gateway/build.gradle.kts create mode 100644 services/gateway/src/main/kotlin/ru/ysu/lms/gateway/GatewayApplication.kt create mode 100644 services/gateway/src/main/kotlin/ru/ysu/lms/gateway/security/JwtAuthenticationFilter.kt create mode 100644 services/gateway/src/main/resources/application.yml create mode 100644 services/identity-service/build.gradle.kts create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/IdentityServiceApplication.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/AuthController.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/AuthDtos.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/AuthService.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/Passwords.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Account.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Enrollment.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/GroupEntity.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Setting.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Student.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/AccountRepository.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/EnrollmentRepository.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/GroupRepository.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/SettingRepository.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/StudentRepository.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/CredentialsExporter.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/GroupController.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/GroupService.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/RosterDtos.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/StudentController.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/StudentImportParser.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/security/JwtConfig.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/security/JwtKeyStore.kt create mode 100644 services/identity-service/src/main/kotlin/ru/ysu/lms/identity/security/SecurityConfig.kt create mode 100644 services/identity-service/src/main/resources/application.yml create mode 100644 services/identity-service/src/main/resources/db/migration/V1__init.sql create mode 100644 services/identity-service/src/main/resources/db/migration/V2__accounts.sql create mode 100644 services/identity-service/src/test/kotlin/ru/ysu/lms/identity/IdentitySmokeTest.kt create mode 100644 services/progress-service/build.gradle.kts create mode 100644 services/progress-service/src/main/kotlin/ru/ysu/lms/progress/ProgressServiceApplication.kt create mode 100644 services/progress-service/src/main/kotlin/ru/ysu/lms/progress/domain/VariantAssignment.kt create mode 100644 services/progress-service/src/main/kotlin/ru/ysu/lms/progress/security/SecurityConfig.kt create mode 100644 services/progress-service/src/main/resources/application.yml create mode 100644 services/progress-service/src/main/resources/db/migration/V1__init.sql create mode 100644 services/progress-service/src/main/resources/db/migration/V2__schema.sql create mode 100644 settings.gradle.kts create mode 100644 web/build.gradle.kts create mode 100644 web/src/main/kotlin/ru/ysu/lms/web/WebApplication.kt create mode 100644 web/src/main/kotlin/ru/ysu/lms/web/admin/AdminController.kt create mode 100644 web/src/main/kotlin/ru/ysu/lms/web/api/ApiClient.kt create mode 100644 web/src/main/kotlin/ru/ysu/lms/web/api/ApiDtos.kt create mode 100644 web/src/main/kotlin/ru/ysu/lms/web/api/ApiException.kt create mode 100644 web/src/main/kotlin/ru/ysu/lms/web/auth/AuthPageController.kt create mode 100644 web/src/main/kotlin/ru/ysu/lms/web/config/WebConfig.kt create mode 100644 web/src/main/kotlin/ru/ysu/lms/web/config/WebErrorAdvice.kt create mode 100644 web/src/main/kotlin/ru/ysu/lms/web/session/AdminInterceptor.kt create mode 100644 web/src/main/kotlin/ru/ysu/lms/web/session/AuthInterceptor.kt create mode 100644 web/src/main/kotlin/ru/ysu/lms/web/session/SessionUser.kt create mode 100644 web/src/main/kotlin/ru/ysu/lms/web/student/StudentController.kt create mode 100644 web/src/main/resources/application.yml create mode 100644 web/src/main/resources/static/css/app.css create mode 100644 web/src/main/resources/static/js/htmx.min.js create mode 100644 web/src/main/resources/templates/admin/dashboard.html create mode 100644 web/src/main/resources/templates/admin/group.html create mode 100644 web/src/main/resources/templates/admin/groups.html create mode 100644 web/src/main/resources/templates/change_password.html create mode 100644 web/src/main/resources/templates/error.html create mode 100644 web/src/main/resources/templates/fragments/base.html create mode 100644 web/src/main/resources/templates/index.html create mode 100644 web/src/main/resources/templates/login.html create mode 100644 web/src/main/resources/templates/setup.html create mode 100644 web/src/main/resources/templates/student/dashboard.html diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..4eee524 --- /dev/null +++ b/.env.example @@ -0,0 +1,8 @@ +# Copy to .env and adjust for your environment. +LMS_DB_NAME=lms +LMS_DB_USER=lms +LMS_DB_PASSWORD=lms +LMS_DB_PORT=5432 + +# JDBC connection string shared by the services (schema is selected per service). +LMS_DB_URL=jdbc:postgresql://localhost:5432/lms diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cd4394c --- /dev/null +++ b/.gitignore @@ -0,0 +1,53 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar + +### LMS ### +.env +/data/ +node_modules/ + +# Reference implementation, kept as a separate nested repository. +oldLMS/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Kotlin ### +.kotlin + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..f98626a --- /dev/null +++ b/README.md @@ -0,0 +1,57 @@ +# LMS + +Микросервисная система для проведения практических занятий (Kotlin + Spring Boot + PostgreSQL 18). + +## Модули + +- `libs/common-http` — общий формат ошибок и обработчик исключений. +- `libs/security-jwt` — выпуск/проверка JWT (RSA) и `PasswordEncoder`. +- `libs/markdown` — серверный рендер markdown со спойлерами и санитизацией. +- `libs/test-support` — общая тестовая инфраструктура (Testcontainers, `postgres:18`). +- `services/identity-service` — аккаунты, студенты, группы, зачисления (схема `identity`). +- `services/academic-service` — курсы, статьи, лабораторные, уровни, варианты (схема `academic`). +- `services/progress-service` — уровни студентов, распределение вариантов, работы, оценки (схема `progress`). +- `services/gateway` — Spring Cloud Gateway, маршрутизация и проверка JWT. +- `web` — серверный веб-интерфейс (Thymeleaf + htmx), BFF. + +## Требования + +- JDK 21+ (сборка использует toolchain 21) +- Docker (для PostgreSQL 18) + +## Запуск + +```bash +cp .env.example .env +docker compose up -d postgres + +./gradlew :services:identity-service:bootRun +./gradlew :services:academic-service:bootRun +./gradlew :services:progress-service:bootRun +./gradlew :services:gateway:bootRun +./gradlew :web:bootRun +``` + +Порты по умолчанию: gateway `:8080`, identity `:8081`, academic `:8082`, +progress `:8083`, web `:8090`. Проверка: `GET :8080/actuator/health`. + +## Текущий функционал + +Открыть `http://localhost:8090`. При первом запуске будет предложено создать +аккаунт администратора (`/setup`); далее — вход по логину и паролю. + +- вход администратора и студентов, обязательная смена пароля при первом входе; +- группы: создание, импорт студентов из `.xls/.xlsx/.csv`, выгрузка логинов и + паролей в XLSX/CSV, сброс пароля студента; +- JWT (RSA, ключи генерируются при первом старте identity и не хранятся в репозитории), + проверка токена на gateway, роли ADMIN/STUDENT. + + +## Сборка и тесты + +```bash +./gradlew build # сборка всех модулей +./gradlew check # тесты и проверки +``` + +Переменные окружения для БД: `LMS_DB_URL`, `LMS_DB_USER`, `LMS_DB_PASSWORD`. diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100644 index 0000000..4adb3bf --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,16 @@ +plugins { + // The Kotlin DSL plugin provides a convenient way to develop convention plugins. + `kotlin-dsl` +} + +kotlin { + jvmToolchain(21) +} + +dependencies { + // Plugins applied by the convention plugins in `src/main/kotlin`. + implementation(libs.kotlinGradlePlugin) + implementation(libs.kotlinAllopenPlugin) + implementation(libs.kotlinNoargPlugin) + implementation(libs.springBootGradlePlugin) +} diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts new file mode 100644 index 0000000..705bfb5 --- /dev/null +++ b/buildSrc/settings.gradle.kts @@ -0,0 +1,17 @@ +dependencyResolutionManagement { + + // Use Maven Central and the Gradle Plugin Portal for resolving dependencies in the shared build logic (`buildSrc`) project. + @Suppress("UnstableApiUsage") + repositories { + mavenCentral() + } + + // Reuse the version catalog from the main build. + versionCatalogs { + create("libs") { + from(files("../gradle/libs.versions.toml")) + } + } +} + +rootProject.name = "buildSrc" \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/lms.spring-boot.gradle.kts b/buildSrc/src/main/kotlin/lms.spring-boot.gradle.kts new file mode 100644 index 0000000..56843d4 --- /dev/null +++ b/buildSrc/src/main/kotlin/lms.spring-boot.gradle.kts @@ -0,0 +1,31 @@ +// Spring Boot application module: Kotlin/JVM + Spring/JPA plugins + Boot plugin. +import org.gradle.api.tasks.testing.logging.TestLogEvent + +plugins { + kotlin("jvm") + id("org.jetbrains.kotlin.plugin.spring") + id("org.jetbrains.kotlin.plugin.jpa") + id("org.springframework.boot") +} + +group = "ru.ysu.lms" +version = "0.1.0-SNAPSHOT" + +kotlin { + jvmToolchain(21) + compilerOptions { + freeCompilerArgs.add("-Xjsr305=strict") + } +} + +dependencies { + // Required by Spring for Kotlin reflection (Spring Data, @ConfigurationProperties binding). + "implementation"(kotlin("reflect")) +} + +tasks.withType().configureEach { + useJUnitPlatform() + testLogging { + events(TestLogEvent.FAILED, TestLogEvent.PASSED, TestLogEvent.SKIPPED) + } +} diff --git a/buildSrc/src/main/kotlin/lms.spring-library.gradle.kts b/buildSrc/src/main/kotlin/lms.spring-library.gradle.kts new file mode 100644 index 0000000..6ac5f59 --- /dev/null +++ b/buildSrc/src/main/kotlin/lms.spring-library.gradle.kts @@ -0,0 +1,24 @@ +// Shared Kotlin library module: Kotlin/JVM + Spring (all-open) compiler plugin. +import org.gradle.api.tasks.testing.logging.TestLogEvent + +plugins { + kotlin("jvm") + id("org.jetbrains.kotlin.plugin.spring") +} + +group = "ru.ysu.lms" +version = "0.1.0-SNAPSHOT" + +kotlin { + jvmToolchain(21) + compilerOptions { + freeCompilerArgs.add("-Xjsr305=strict") + } +} + +tasks.withType().configureEach { + useJUnitPlatform() + testLogging { + events(TestLogEvent.FAILED, TestLogEvent.PASSED, TestLogEvent.SKIPPED) + } +} diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..d6ef15e --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,22 @@ +# Local development infrastructure. Start PostgreSQL 18 with: docker compose up -d postgres +services: + postgres: + image: postgres:18 + container_name: lms-postgres + environment: + POSTGRES_DB: ${LMS_DB_NAME:-lms} + POSTGRES_USER: ${LMS_DB_USER:-lms} + POSTGRES_PASSWORD: ${LMS_DB_PASSWORD:-lms} + ports: + - "${LMS_DB_PORT:-5432}:5432" + volumes: + # PostgreSQL 18+ stores data under a versioned subdirectory of /var/lib/postgresql. + - lms_pgdata:/var/lib/postgresql + healthcheck: + test: ["CMD-SHELL", "pg_isready -U ${LMS_DB_USER:-lms} -d ${LMS_DB_NAME:-lms}"] + interval: 5s + timeout: 3s + retries: 10 + +volumes: + lms_pgdata: diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..13ff322 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,8 @@ +# Enable the build cache to save time by reusing outputs produced by other successful builds. +# https://docs.gradle.org/current/userguide/build_cache.html +org.gradle.caching=true + +# Enable the configuration cache to reuse the build configuration and enable parallel task execution. +# (Note that some plugins may not yet be compatible with the configuration cache.) +# https://docs.gradle.org/current/userguide/configuration_cache.html +org.gradle.configuration-cache=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..67f8f2f --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,80 @@ +# Version catalog: central place for dependency versions. +# https://docs.gradle.org/current/userguide/platforms.html#sub:version-catalog + +[versions] +# Spring Boot 4.0.x is the release train matched by Spring Cloud 2025.1.x. +springBoot = "4.0.8" +springCloud = "2025.1.3" +kotlin = "2.4.20" +springdoc = "3.0.3" +flexmark = "0.64.8" +owaspSanitizer = "20260313.1" +apachePoi = "5.5.1" + +[libraries] +# --- Gradle plugins used from buildSrc --- +kotlinGradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } +kotlinAllopenPlugin = { module = "org.jetbrains.kotlin:kotlin-allopen", version.ref = "kotlin" } +kotlinNoargPlugin = { module = "org.jetbrains.kotlin:kotlin-noarg", version.ref = "kotlin" } +springBootGradlePlugin = { module = "org.springframework.boot:spring-boot-gradle-plugin", version.ref = "springBoot" } + +# --- Platform BOMs (versions only) --- +springBootBom = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "springBoot" } +springCloudBom = { module = "org.springframework.cloud:spring-cloud-dependencies", version.ref = "springCloud" } + +# --- Spring Boot starters (versions managed by the Boot BOM) --- +springBootStarterWeb = { module = "org.springframework.boot:spring-boot-starter-web" } +springBootStarterWebflux = { module = "org.springframework.boot:spring-boot-starter-webflux" } +springBootStarterValidation = { module = "org.springframework.boot:spring-boot-starter-validation" } +springBootStarterActuator = { module = "org.springframework.boot:spring-boot-starter-actuator" } +springBootStarterDataJpa = { module = "org.springframework.boot:spring-boot-starter-data-jpa" } +springBootStarterFlyway = { module = "org.springframework.boot:spring-boot-starter-flyway" } +springBootStarterSecurity = { module = "org.springframework.boot:spring-boot-starter-security" } +springBootStarterOauth2ResourceServer = { module = "org.springframework.boot:spring-boot-starter-oauth2-resource-server" } +springBootStarterThymeleaf = { module = "org.springframework.boot:spring-boot-starter-thymeleaf" } +springBootStarterTest = { module = "org.springframework.boot:spring-boot-starter-test" } +springBootDevtools = { module = "org.springframework.boot:spring-boot-devtools" } +springSecurityTest = { module = "org.springframework.security:spring-security-test" } + +# --- Spring Cloud --- +springCloudStarterGatewayWebflux = { module = "org.springframework.cloud:spring-cloud-starter-gateway-server-webflux" } + +# --- Plain Spring libraries (for shared modules) --- +springWeb = { module = "org.springframework:spring-web" } +springContext = { module = "org.springframework:spring-context" } +springBootAutoconfigure = { module = "org.springframework.boot:spring-boot-autoconfigure" } +springSecurityConfig = { module = "org.springframework.security:spring-security-config" } +springSecurityWeb = { module = "org.springframework.security:spring-security-web" } +springSecurityOauth2Jose = { module = "org.springframework.security:spring-security-oauth2-jose" } + +# --- Persistence / migrations --- +flywayCore = { module = "org.flywaydb:flyway-core" } +flywayPostgresql = { module = "org.flywaydb:flyway-database-postgresql" } +postgresql = { module = "org.postgresql:postgresql" } +jacksonYaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml" } +jacksonModuleKotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin" } + +# --- API docs --- +springdocStarterWebmvcUi = { module = "org.springdoc:springdoc-openapi-starter-webmvc-ui", version.ref = "springdoc" } + +# --- Markdown rendering --- +flexmarkAll = { module = "com.vladsch.flexmark:flexmark-all", version.ref = "flexmark" } +owaspHtmlSanitizer = { module = "com.googlecode.owasp-java-html-sanitizer:owasp-java-html-sanitizer", version.ref = "owaspSanitizer" } + +# --- Spreadsheet import/export --- +apachePoiOoxml = { module = "org.apache.poi:poi-ooxml", version.ref = "apachePoi" } + +# --- Tests / Testcontainers (versions managed by the Boot BOM) --- +springBootTestcontainers = { module = "org.springframework.boot:spring-boot-testcontainers" } +testcontainersPostgresql = { module = "org.testcontainers:testcontainers-postgresql" } +testcontainersJunitJupiter = { module = "org.testcontainers:testcontainers-junit-jupiter" } + +[bundles] +springWeb = ["springBootStarterWeb", "springBootStarterValidation", "springBootStarterActuator"] +springPersistence = ["springBootStarterDataJpa", "flywayCore", "flywayPostgresql", "postgresql"] + +[plugins] +kotlinPluginJvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } +kotlinPluginSpring = { id = "org.jetbrains.kotlin.plugin.spring", version.ref = "kotlin" } +kotlinPluginJpa = { id = "org.jetbrains.kotlin.plugin.jpa", version.ref = "kotlin" } +springBootPlugin = { id = "org.springframework.boot", version.ref = "springBoot" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/libs/common-http/build.gradle.kts b/libs/common-http/build.gradle.kts new file mode 100644 index 0000000..b686a0b --- /dev/null +++ b/libs/common-http/build.gradle.kts @@ -0,0 +1,10 @@ +plugins { + id("lms.spring-library") +} + +dependencies { + implementation(platform(libs.springBootBom)) + + api(libs.springWeb) + api(libs.springBootAutoconfigure) +} diff --git a/libs/common-http/src/main/kotlin/ru/ysu/lms/common/ApiError.kt b/libs/common-http/src/main/kotlin/ru/ysu/lms/common/ApiError.kt new file mode 100644 index 0000000..e3f41d4 --- /dev/null +++ b/libs/common-http/src/main/kotlin/ru/ysu/lms/common/ApiError.kt @@ -0,0 +1,21 @@ +package ru.ysu.lms.common + +import java.time.Instant + +/** + * Uniform error payload, close to RFC 9457 "Problem Details for HTTP APIs". + */ +data class ApiError( + val type: String = "about:blank", + val title: String, + val status: Int, + val detail: String? = null, + val code: String? = null, + val violations: List = emptyList(), + val timestamp: Instant = Instant.now(), +) + +data class FieldViolation( + val field: String, + val message: String, +) diff --git a/libs/common-http/src/main/kotlin/ru/ysu/lms/common/Ids.kt b/libs/common-http/src/main/kotlin/ru/ysu/lms/common/Ids.kt new file mode 100644 index 0000000..286947f --- /dev/null +++ b/libs/common-http/src/main/kotlin/ru/ysu/lms/common/Ids.kt @@ -0,0 +1,21 @@ +package ru.ysu.lms.common + +import java.security.SecureRandom +import java.util.UUID + +/** + * Time-ordered UUIDv7 identifiers (the same layout PostgreSQL 18 provides with + * `uuidv7()`), so application-generated and database-generated ids match. + */ +object Ids { + private val random = SecureRandom() + + fun v7(): UUID { + val timestamp = System.currentTimeMillis() and 0x0000_FFFF_FFFF_FFFFL + val randA = (random.nextInt() and 0x0FFF).toLong() + val randB = random.nextLong() and 0x3FFF_FFFF_FFFF_FFFFL + val msb = (timestamp shl 16) or 0x7000L or randA + val lsb = Long.MIN_VALUE or randB + return UUID(msb, lsb) + } +} diff --git a/libs/common-http/src/main/kotlin/ru/ysu/lms/common/LmsCommonAutoConfiguration.kt b/libs/common-http/src/main/kotlin/ru/ysu/lms/common/LmsCommonAutoConfiguration.kt new file mode 100644 index 0000000..3ce3579 --- /dev/null +++ b/libs/common-http/src/main/kotlin/ru/ysu/lms/common/LmsCommonAutoConfiguration.kt @@ -0,0 +1,13 @@ +package ru.ysu.lms.common + +import org.springframework.boot.autoconfigure.AutoConfiguration +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean +import org.springframework.context.annotation.Bean + +@AutoConfiguration +class LmsCommonAutoConfiguration { + + @Bean + @ConditionalOnMissingBean + fun lmsExceptionHandler(): LmsExceptionHandler = LmsExceptionHandler() +} diff --git a/libs/common-http/src/main/kotlin/ru/ysu/lms/common/LmsException.kt b/libs/common-http/src/main/kotlin/ru/ysu/lms/common/LmsException.kt new file mode 100644 index 0000000..fa64d78 --- /dev/null +++ b/libs/common-http/src/main/kotlin/ru/ysu/lms/common/LmsException.kt @@ -0,0 +1,29 @@ +package ru.ysu.lms.common + +import org.springframework.http.HttpStatus + +/** + * Base class for expected, domain-level failures. Mapped to [ApiError] by + * [LmsExceptionHandler]. + */ +open class LmsException( + val status: HttpStatus, + override val message: String, + val code: String? = null, + val violations: List = emptyList(), +) : RuntimeException(message) + +class BadRequestException(message: String, code: String? = null) : + LmsException(HttpStatus.BAD_REQUEST, message, code) + +class NotFoundException(message: String, code: String? = null) : + LmsException(HttpStatus.NOT_FOUND, message, code) + +class ConflictException(message: String, code: String? = null) : + LmsException(HttpStatus.CONFLICT, message, code) + +class ForbiddenException(message: String, code: String? = null) : + LmsException(HttpStatus.FORBIDDEN, message, code) + +class UnauthorizedException(message: String, code: String? = null) : + LmsException(HttpStatus.UNAUTHORIZED, message, code) diff --git a/libs/common-http/src/main/kotlin/ru/ysu/lms/common/LmsExceptionHandler.kt b/libs/common-http/src/main/kotlin/ru/ysu/lms/common/LmsExceptionHandler.kt new file mode 100644 index 0000000..be75c54 --- /dev/null +++ b/libs/common-http/src/main/kotlin/ru/ysu/lms/common/LmsExceptionHandler.kt @@ -0,0 +1,37 @@ +package ru.ysu.lms.common + +import org.springframework.http.ResponseEntity +import org.springframework.web.bind.MethodArgumentNotValidException +import org.springframework.web.bind.annotation.ExceptionHandler +import org.springframework.web.bind.annotation.RestControllerAdvice + +@RestControllerAdvice +class LmsExceptionHandler { + + @ExceptionHandler(LmsException::class) + fun handleDomain(ex: LmsException): ResponseEntity = + ResponseEntity.status(ex.status).body( + ApiError( + title = ex.status.reasonPhrase, + status = ex.status.value(), + detail = ex.message, + code = ex.code, + violations = ex.violations, + ), + ) + + @ExceptionHandler(MethodArgumentNotValidException::class) + fun handleValidation(ex: MethodArgumentNotValidException): ResponseEntity { + val violations = ex.bindingResult.fieldErrors.map { + FieldViolation(field = it.field, message = it.defaultMessage ?: "invalid value") + } + return ResponseEntity.badRequest().body( + ApiError( + title = "Validation failed", + status = 400, + detail = "Request validation failed", + violations = violations, + ), + ) + } +} diff --git a/libs/common-http/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/libs/common-http/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..2b3b602 --- /dev/null +++ b/libs/common-http/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +ru.ysu.lms.common.LmsCommonAutoConfiguration diff --git a/libs/markdown/build.gradle.kts b/libs/markdown/build.gradle.kts new file mode 100644 index 0000000..37797db --- /dev/null +++ b/libs/markdown/build.gradle.kts @@ -0,0 +1,12 @@ +plugins { + id("lms.spring-library") +} + +dependencies { + implementation(platform(libs.springBootBom)) + + api(libs.flexmarkAll) + api(libs.owaspHtmlSanitizer) + api(libs.springContext) + api(libs.springBootAutoconfigure) +} diff --git a/libs/markdown/src/main/kotlin/ru/ysu/lms/markdown/LmsMarkdownAutoConfiguration.kt b/libs/markdown/src/main/kotlin/ru/ysu/lms/markdown/LmsMarkdownAutoConfiguration.kt new file mode 100644 index 0000000..06d823b --- /dev/null +++ b/libs/markdown/src/main/kotlin/ru/ysu/lms/markdown/LmsMarkdownAutoConfiguration.kt @@ -0,0 +1,16 @@ +package ru.ysu.lms.markdown + +import org.springframework.boot.autoconfigure.AutoConfiguration +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean +import org.springframework.boot.context.properties.EnableConfigurationProperties +import org.springframework.context.annotation.Bean + +@AutoConfiguration +@EnableConfigurationProperties(MarkdownProperties::class) +class LmsMarkdownAutoConfiguration { + + @Bean + @ConditionalOnMissingBean + fun markdownRenderer(properties: MarkdownProperties): MarkdownRenderer = + MarkdownRenderer(allowHtml = properties.allowHtml) +} diff --git a/libs/markdown/src/main/kotlin/ru/ysu/lms/markdown/MarkdownProperties.kt b/libs/markdown/src/main/kotlin/ru/ysu/lms/markdown/MarkdownProperties.kt new file mode 100644 index 0000000..37e21d3 --- /dev/null +++ b/libs/markdown/src/main/kotlin/ru/ysu/lms/markdown/MarkdownProperties.kt @@ -0,0 +1,9 @@ +package ru.ysu.lms.markdown + +import org.springframework.boot.context.properties.ConfigurationProperties + +@ConfigurationProperties(prefix = "lms.markdown") +data class MarkdownProperties( + /** When true, raw HTML in the source markdown is passed through (still sanitized). */ + val allowHtml: Boolean = false, +) diff --git a/libs/markdown/src/main/kotlin/ru/ysu/lms/markdown/MarkdownRenderer.kt b/libs/markdown/src/main/kotlin/ru/ysu/lms/markdown/MarkdownRenderer.kt new file mode 100644 index 0000000..ab0464c --- /dev/null +++ b/libs/markdown/src/main/kotlin/ru/ysu/lms/markdown/MarkdownRenderer.kt @@ -0,0 +1,113 @@ +package ru.ysu.lms.markdown + +import com.vladsch.flexmark.ext.autolink.AutolinkExtension +import com.vladsch.flexmark.ext.footnotes.FootnoteExtension +import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughExtension +import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension +import com.vladsch.flexmark.ext.tables.TablesExtension +import com.vladsch.flexmark.html.HtmlRenderer +import com.vladsch.flexmark.parser.Parser +import com.vladsch.flexmark.util.data.MutableDataSet +import org.owasp.html.HtmlPolicyBuilder +import org.owasp.html.PolicyFactory + +/** + * Renders LMS markdown to sanitized HTML. + * + * Supported beyond CommonMark: tables, strikethrough, task lists, footnotes, + * autolinks and the custom spoiler container: + * + * ``` + * :::spoiler Заголовок + * скрытый текст (тоже markdown) + * ::: + * ``` + * + * The result is always passed through an allow-list HTML sanitizer, so authors + * cannot inject scripts or arbitrary markup. + */ +class MarkdownRenderer( + private val allowHtml: Boolean = false, +) { + private val options = MutableDataSet().apply { + set( + Parser.EXTENSIONS, + listOf( + TablesExtension.create(), + StrikethroughExtension.create(), + TaskListExtension.create(), + FootnoteExtension.create(), + AutolinkExtension.create(), + ), + ) + set(HtmlRenderer.GENERATE_HEADER_ID, true) + set(HtmlRenderer.SOFT_BREAK, "
\n") + set(HtmlRenderer.ESCAPE_HTML, !allowHtml) + } + + private val parser: Parser = Parser.builder(options).build() + private val renderer: HtmlRenderer = HtmlRenderer.builder(options).build() + private val sanitizer: PolicyFactory = buildSanitizer() + + fun render(markdown: String): String = sanitizer.sanitize(renderRaw(markdown, depth = 0)) + + private fun renderRaw(markdown: String, depth: Int): String { + val out = StringBuilder() + var cursor = 0 + for (match in SPOILER.findAll(markdown)) { + out.append(renderSegment(markdown.substring(cursor, match.range.first))) + val title = match.groupValues[1].trim().ifBlank { "Спойлер" } + val body = match.groupValues[2] + val inner = if (depth < MAX_DEPTH) { + renderRaw(body, depth + 1) + } else { + renderSegment(body) + } + out.append("

") + out.append(escapeHtml(title)) + out.append("
") + out.append(inner) + out.append("
") + cursor = match.range.last + 1 + } + out.append(renderSegment(markdown.substring(cursor))) + return out.toString() + } + + private fun renderSegment(markdown: String): String = + renderer.render(parser.parse(markdown)) + + private fun escapeHtml(value: String): String = value + .replace("&", "&") + .replace("<", "<") + .replace(">", ">") + .replace("\"", """) + + private fun buildSanitizer(): PolicyFactory = HtmlPolicyBuilder() + .allowElements( + "p", "br", "hr", + "h1", "h2", "h3", "h4", "h5", "h6", + "strong", "b", "em", "i", "del", "s", "blockquote", + "ul", "ol", "li", + "a", "img", + "code", "pre", + "table", "thead", "tbody", "tr", "th", "td", + "details", "summary", "div", "span", "sup", "sub", "kbd", "figure", "figcaption", + ) + .allowAttributes("href").onElements("a") + .allowAttributes("title").onElements("a", "img") + .allowAttributes("src", "alt").onElements("img") + .allowAttributes("class").onElements("code", "pre", "div", "span", "details", "summary", "table", "th", "td") + .allowAttributes("id").onElements("h1", "h2", "h3", "h4", "h5", "h6") + .allowAttributes("colspan", "rowspan").onElements("td", "th") + .allowUrlProtocols("http", "https", "mailto") + .requireRelNofollowOnLinks() + .toFactory() + + private companion object { + const val MAX_DEPTH = 5 + val SPOILER = Regex( + pattern = "(?ms)^[ \\t]*:::[ \\t]*spoiler(?:[ \\t]+(.+?))?[ \\t]*\\r?\\n(.*?)^[ \\t]*:::[ \\t]*$", + ) + } +} diff --git a/libs/markdown/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/libs/markdown/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..0db8ab9 --- /dev/null +++ b/libs/markdown/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +ru.ysu.lms.markdown.LmsMarkdownAutoConfiguration diff --git a/libs/security-jwt/build.gradle.kts b/libs/security-jwt/build.gradle.kts new file mode 100644 index 0000000..307e5ab --- /dev/null +++ b/libs/security-jwt/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + id("lms.spring-library") +} + +dependencies { + implementation(platform(libs.springBootBom)) + + api(libs.springContext) + api(libs.springBootAutoconfigure) + api(libs.springSecurityOauth2Jose) +} diff --git a/libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/JwtPrincipal.kt b/libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/JwtPrincipal.kt new file mode 100644 index 0000000..e017556 --- /dev/null +++ b/libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/JwtPrincipal.kt @@ -0,0 +1,15 @@ +package ru.ysu.lms.security + +enum class LmsRole { + ADMIN, + STUDENT; + + fun authority(): String = "ROLE_$name" +} + +data class JwtPrincipal( + val accountId: String, + val login: String, + val role: LmsRole, + val displayName: String? = null, +) diff --git a/libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/JwtProperties.kt b/libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/JwtProperties.kt new file mode 100644 index 0000000..6359939 --- /dev/null +++ b/libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/JwtProperties.kt @@ -0,0 +1,16 @@ +package ru.ysu.lms.security + +import org.springframework.boot.context.properties.ConfigurationProperties +import java.time.Duration + +@ConfigurationProperties(prefix = "lms.jwt") +data class JwtProperties( + val issuer: String = "lms", + /** PKCS#8 PEM private key. Empty disables the encoder. */ + val privateKey: String = "", + /** X.509 PEM public key. Empty disables the decoder. */ + val publicKey: String = "", + /** JWKS endpoint used to build the decoder when [publicKey] is empty. */ + val jwkSetUri: String = "", + val accessTokenTtl: Duration = Duration.ofHours(12), +) diff --git a/libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/LmsSecurityAutoConfiguration.kt b/libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/LmsSecurityAutoConfiguration.kt new file mode 100644 index 0000000..5c1983e --- /dev/null +++ b/libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/LmsSecurityAutoConfiguration.kt @@ -0,0 +1,48 @@ +package ru.ysu.lms.security + +import com.nimbusds.jose.jwk.JWKSet +import com.nimbusds.jose.jwk.RSAKey +import com.nimbusds.jose.jwk.source.ImmutableJWKSet +import com.nimbusds.jose.proc.SecurityContext +import org.springframework.boot.autoconfigure.AutoConfiguration +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty +import org.springframework.boot.context.properties.EnableConfigurationProperties +import org.springframework.context.annotation.Bean +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder +import org.springframework.security.crypto.password.PasswordEncoder +import org.springframework.security.oauth2.jwt.JwtDecoder +import org.springframework.security.oauth2.jwt.JwtEncoder +import org.springframework.security.oauth2.jwt.NimbusJwtDecoder +import org.springframework.security.oauth2.jwt.NimbusJwtEncoder + +@AutoConfiguration +@EnableConfigurationProperties(JwtProperties::class) +class LmsSecurityAutoConfiguration { + + @Bean + @ConditionalOnMissingBean + @ConditionalOnProperty(prefix = "lms.jwt", name = ["private-key"]) + fun jwtEncoder(properties: JwtProperties): JwtEncoder { + val rsaKey = RSAKey.Builder(RsaKeys.publicKey(properties.publicKey)) + .privateKey(RsaKeys.privateKey(properties.privateKey)) + .build() + return NimbusJwtEncoder(ImmutableJWKSet(JWKSet(rsaKey))) + } + + @Bean + @ConditionalOnMissingBean + fun jwtDecoder(properties: JwtProperties): JwtDecoder = + if (properties.jwkSetUri.isNotBlank()) { + NimbusJwtDecoder.withJwkSetUri(properties.jwkSetUri).build() + } else { + require(properties.publicKey.isNotBlank()) { + "Configure either lms.jwt.jwk-set-uri or lms.jwt.public-key" + } + NimbusJwtDecoder.withPublicKey(RsaKeys.publicKey(properties.publicKey)).build() + } + + @Bean + @ConditionalOnMissingBean + fun passwordEncoder(): PasswordEncoder = BCryptPasswordEncoder() +} diff --git a/libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/RsaKeys.kt b/libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/RsaKeys.kt new file mode 100644 index 0000000..3c7d437 --- /dev/null +++ b/libs/security-jwt/src/main/kotlin/ru/ysu/lms/security/RsaKeys.kt @@ -0,0 +1,32 @@ +package ru.ysu.lms.security + +import java.security.KeyFactory +import java.security.interfaces.RSAPrivateKey +import java.security.interfaces.RSAPublicKey +import java.security.spec.PKCS8EncodedKeySpec +import java.security.spec.X509EncodedKeySpec +import java.util.Base64 + +/** Parses PEM-encoded RSA keys (PKCS#8 private, X.509 public). */ +object RsaKeys { + + fun publicKey(pem: String): RSAPublicKey { + val der = decode(pem) + return KeyFactory.getInstance("RSA") + .generatePublic(X509EncodedKeySpec(der)) as RSAPublicKey + } + + fun privateKey(pem: String): RSAPrivateKey { + val der = decode(pem) + return KeyFactory.getInstance("RSA") + .generatePrivate(PKCS8EncodedKeySpec(der)) as RSAPrivateKey + } + + private fun decode(pem: String): ByteArray { + val body = pem + .replace(Regex("-----BEGIN [A-Z ]+-----"), "") + .replace(Regex("-----END [A-Z ]+-----"), "") + .replace(Regex("\\s"), "") + return Base64.getDecoder().decode(body) + } +} diff --git a/libs/security-jwt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/libs/security-jwt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..4b09211 --- /dev/null +++ b/libs/security-jwt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +ru.ysu.lms.security.LmsSecurityAutoConfiguration diff --git a/libs/test-support/build.gradle.kts b/libs/test-support/build.gradle.kts new file mode 100644 index 0000000..2190dc1 --- /dev/null +++ b/libs/test-support/build.gradle.kts @@ -0,0 +1,13 @@ +plugins { + id("lms.spring-library") +} + +dependencies { + implementation(platform(libs.springBootBom)) + + // Shared integration-test infrastructure. Consumers add this module as testImplementation. + api(libs.springBootTestcontainers) + api(libs.testcontainersPostgresql) + api(libs.testcontainersJunitJupiter) + api(libs.springBootStarterTest) +} diff --git a/libs/test-support/src/main/kotlin/ru/ysu/lms/test/DatabaseTestSupport.kt b/libs/test-support/src/main/kotlin/ru/ysu/lms/test/DatabaseTestSupport.kt new file mode 100644 index 0000000..ec48365 --- /dev/null +++ b/libs/test-support/src/main/kotlin/ru/ysu/lms/test/DatabaseTestSupport.kt @@ -0,0 +1,8 @@ +package ru.ysu.lms.test + +object DatabaseTestSupport { + const val POSTGRES_IMAGE: String = "postgres:18" + const val SCHEMA_IDENTITY: String = "identity" + const val SCHEMA_ACADEMIC: String = "academic" + const val SCHEMA_PROGRESS: String = "progress" +} diff --git a/services/academic-service/build.gradle.kts b/services/academic-service/build.gradle.kts new file mode 100644 index 0000000..b928714 --- /dev/null +++ b/services/academic-service/build.gradle.kts @@ -0,0 +1,30 @@ +plugins { + id("lms.spring-boot") +} + +dependencies { + implementation(platform(libs.springBootBom)) + + implementation(libs.springBootStarterWeb) + implementation(libs.springBootStarterValidation) + implementation(libs.springBootStarterActuator) + implementation(libs.springBootStarterDataJpa) + implementation(libs.springBootStarterSecurity) + implementation(libs.springBootStarterOauth2ResourceServer) + implementation(libs.springBootStarterFlyway) + implementation(libs.flywayPostgresql) + runtimeOnly(libs.postgresql) + implementation(libs.jacksonYaml) + implementation(libs.jacksonModuleKotlin) + implementation(libs.springdocStarterWebmvcUi) + + implementation(project(":libs:common-http")) + implementation(project(":libs:markdown")) + implementation(project(":libs:security-jwt")) + + testImplementation(project(":libs:test-support")) +} + +springBoot { + mainClass.set("ru.ysu.lms.academic.AcademicServiceApplicationKt") +} diff --git a/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/AcademicServiceApplication.kt b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/AcademicServiceApplication.kt new file mode 100644 index 0000000..844f558 --- /dev/null +++ b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/AcademicServiceApplication.kt @@ -0,0 +1,11 @@ +package ru.ysu.lms.academic + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication + +@SpringBootApplication +class AcademicServiceApplication + +fun main(args: Array) { + runApplication(*args) +} diff --git a/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/controller/LabController.kt b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/controller/LabController.kt new file mode 100644 index 0000000..3cb935a --- /dev/null +++ b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/controller/LabController.kt @@ -0,0 +1,33 @@ +package ru.ysu.lms.academic.controller + +import org.springframework.http.ResponseEntity +import org.springframework.security.access.prepost.PreAuthorize +import org.springframework.web.bind.annotation.* +import org.springframework.web.multipart.MultipartFile +import ru.ysu.lms.academic.lab.* +import ru.ysu.lms.common.BadRequestException +import java.util.UUID + +@RestController +@RequestMapping("/api/v1/labs") +class LabController(private val labService: LabService) { + + @GetMapping + fun list(): List = labService.list() + + @GetMapping("/{id}") + fun detail(@PathVariable id: UUID): LabDetail = labService.detail(id) + + @PostMapping("/import") + @PreAuthorize("hasAuthority('ROLE_ADMIN')") + fun importLab(@RequestParam("file") file: MultipartFile): LabImportResult { + if (file.isEmpty) throw BadRequestException("Выберите файл") + return labService.importFromFile(file.originalFilename ?: "lab.zip", file.bytes) + } + + @DeleteMapping("/{id}") + @PreAuthorize("hasAuthority('ROLE_ADMIN')") + fun delete(@PathVariable id: UUID) { + labService.delete(id) + } +} \ No newline at end of file diff --git a/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/Lab.kt b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/Lab.kt new file mode 100644 index 0000000..bcae3e0 --- /dev/null +++ b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/Lab.kt @@ -0,0 +1,40 @@ +package ru.ysu.lms.academic.domain + +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.FetchType +import jakarta.persistence.Id +import jakarta.persistence.JoinColumn +import jakarta.persistence.ManyToOne +import jakarta.persistence.OneToMany +import jakarta.persistence.OrderBy +import jakarta.persistence.Table +import ru.ysu.lms.common.Ids +import java.time.Instant +import java.util.UUID + +@Entity +@Table(name = "labs") +class Lab( + @Id + var id: UUID = Ids.v7(), + @Column(nullable = false) + var number: Int = 0, + @Column(nullable = false, length = 200) + var title: String = "", + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "semester_id", nullable = false) + var semester: Semester? = null, + @Column(name = "description_md", nullable = false) + var descriptionMd: String = "", + @Column(name = "deadline_at") + var deadlineAt: Instant? = null, + @Column(name = "defense_at") + var defenseAt: Instant? = null, + @Column(name = "points_max", nullable = false, columnDefinition = "numeric(4,1)") + var pointsMax: java.math.BigDecimal = java.math.BigDecimal.valueOf(5.0), + @Column(nullable = false, length = 16) + var status: String = "draft", + @Column(name = "created_at", nullable = false) + var createdAt: Instant = Instant.now(), +) \ No newline at end of file diff --git a/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/LabLevel.kt b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/LabLevel.kt new file mode 100644 index 0000000..7e7bdd6 --- /dev/null +++ b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/LabLevel.kt @@ -0,0 +1,31 @@ +package ru.ysu.lms.academic.domain + +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.FetchType +import jakarta.persistence.Id +import jakarta.persistence.JoinColumn +import jakarta.persistence.ManyToOne +import jakarta.persistence.Table +import ru.ysu.lms.common.Ids +import java.util.UUID + +@Entity +@Table(name = "lab_levels") +class LabLevel( + @Id + var id: UUID = Ids.v7(), + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "lab_id", nullable = false) + var lab: Lab? = null, + @Column(nullable = false, length = 32) + var code: String = "", + @Column(nullable = false, length = 100) + var title: String = "", + @Column(nullable = false) + var description: String = "", + @Column(nullable = false) + var position: Int = 0, + @Column(name = "points_max", columnDefinition = "numeric(4,1)") + var pointsMax: java.math.BigDecimal? = null, +) \ No newline at end of file diff --git a/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/Semester.kt b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/Semester.kt new file mode 100644 index 0000000..d8bb486 --- /dev/null +++ b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/Semester.kt @@ -0,0 +1,21 @@ +package ru.ysu.lms.academic.domain + +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table +import ru.ysu.lms.common.Ids +import java.util.UUID + +@Entity +@Table(name = "semesters") +class Semester( + @Id + var id: UUID = Ids.v7(), + @Column(nullable = false, length = 100) + var title: String = "", + @Column(nullable = false) + var year: Int = 0, + @Column(nullable = false) + var active: Boolean = false, +) \ No newline at end of file diff --git a/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/Variant.kt b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/Variant.kt new file mode 100644 index 0000000..d18b016 --- /dev/null +++ b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/domain/Variant.kt @@ -0,0 +1,32 @@ +package ru.ysu.lms.academic.domain + +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.FetchType +import jakarta.persistence.Id +import jakarta.persistence.JoinColumn +import jakarta.persistence.ManyToOne +import jakarta.persistence.Table +import ru.ysu.lms.common.Ids +import java.util.UUID + +@Entity +@Table(name = "variants") +class Variant( + @Id + var id: UUID = Ids.v7(), + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "lab_id", nullable = false) + var lab: Lab? = null, + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "lab_level_id", nullable = false) + var labLevel: LabLevel? = null, + @Column(nullable = false, length = 32) + var number: String = "", + @Column(nullable = false, length = 200) + var title: String = "", + @Column(name = "statement_md", nullable = false) + var statementMd: String = "", + @Column(nullable = false) + var position: Int = 0, +) \ No newline at end of file diff --git a/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/lab/LabDtos.kt b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/lab/LabDtos.kt new file mode 100644 index 0000000..ddba623 --- /dev/null +++ b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/lab/LabDtos.kt @@ -0,0 +1,80 @@ +package ru.ysu.lms.academic.lab + +import java.math.BigDecimal + +data class LabMeta( + val number: Int, + val title: String, + val pointsMax: BigDecimal = BigDecimal.valueOf(5.0), + val deadlineAt: String? = null, + val defenseAt: String? = null, + val status: String = "draft", + val levels: List = emptyList(), +) + +data class LabLevelMeta( + val code: String, + val title: String, + val description: String = "", + val position: Int = 0, + val pointsMax: BigDecimal? = null, +) + +data class VariantMeta( + val level: String, + val number: String, + val title: String = "", + val statement: String = "", +) + +data class LabImportBundle( + val meta: LabMeta, + val descriptionMd: String, + val variants: List, + val assets: Map = emptyMap(), +) + +data class LabImportResult( + val labId: String, + val number: Int, + val title: String, + val levelCount: Int, + val variantCount: Int, +) + +data class LabSummary( + val id: String, + val number: Int, + val title: String, + val status: String, + val semesterTitle: String, + val deadlineAt: String?, + val defenseAt: String?, + val pointsMax: BigDecimal, + val variantCount: Int, +) + +data class LabDetail( + val id: String, + val number: Int, + val title: String, + val status: String, + val descriptionMd: String, + val deadlineAt: String?, + val defenseAt: String?, + val pointsMax: BigDecimal, + val levels: List, +) + +data class LabLevelDetail( + val code: String, + val title: String, + val variants: List, +) + +data class VariantDetail( + val id: String, + val number: String, + val title: String, + val statementMd: String, +) \ No newline at end of file diff --git a/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/lab/LabImportParser.kt b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/lab/LabImportParser.kt new file mode 100644 index 0000000..c286ee9 --- /dev/null +++ b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/lab/LabImportParser.kt @@ -0,0 +1,165 @@ +package ru.ysu.lms.academic.lab + +import com.fasterxml.jackson.databind.JsonNode +import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.databind.PropertyNamingStrategies +import com.fasterxml.jackson.dataformat.yaml.YAMLFactory +import com.fasterxml.jackson.module.kotlin.KotlinModule +import org.springframework.stereotype.Component +import ru.ysu.lms.common.BadRequestException +import java.io.ByteArrayInputStream +import java.math.BigDecimal +import java.util.zip.ZipInputStream + +@Component +class LabImportParser { + private val yaml = ObjectMapper(YAMLFactory()) + .registerModule(KotlinModule.Builder().build()) + .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE) + .configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + private val json = ObjectMapper() + + fun parse(filename: String, bytes: ByteArray): LabImportBundle { + val lower = filename.lowercase() + if (!(lower.endsWith(".zip") || lower.endsWith(".json"))) { + throw BadRequestException("Формат должен быть .zip (рекомендуется) или .json") + } + return if (lower.endsWith(".json")) { + parseJson(bytes) + } else { + parseZip(bytes) + } + } + + private fun parseJson(bytes: ByteArray): LabImportBundle { + val tree = json.readTree(bytes) + val meta = LabMeta( + number = tree.path("number").asInt(), + title = tree.path("title").asText(), + pointsMax = BigDecimal.valueOf(tree.path("points_max").asDouble(5.0)), + deadlineAt = tree.path("deadline").asText("").ifBlank { null }, + defenseAt = tree.path("defense_at").asText("").ifBlank { null }, + status = tree.path("status").asText("published"), + levels = parseLevels(tree), + ) + val descriptionMd = tree.path("common_requirements").asText("") + val variants = parseVariantsFromTree(tree, meta.levels) + return LabImportBundle(meta, descriptionMd, variants) + } + + private fun parseZip(bytes: ByteArray): LabImportBundle { + val entries = mutableMapOf() + ZipInputStream(ByteArrayInputStream(bytes)).use { zis -> + var entry = zis.nextEntry + while (entry != null) { + if (!entry.isDirectory) { + entries[entry.name] = zis.readAllBytes() + } + entry = zis.nextEntry + } + } + + val metaEntry = entries.entries.firstOrNull { it.key.endsWith("lab.yaml") || it.key.endsWith("lab.yml") } + ?: throw BadRequestException("В архиве не найден lab.yaml") + val meta = yaml.readValue(metaEntry.value, LabMeta::class.java) + + val readmeEntry = entries.entries.firstOrNull { it.key.endsWith("/README.md") || it.key == "README.md" } + val readmeMd = readmeEntry?.let { String(it.value, Charsets.UTF_8) } ?: "" + + val variants = mutableListOf() + val assets = mutableMapOf() + + for ((path, data) in entries) { + val p = path.replace('\\', '/') + when { + p.contains("/variants/") || p.startsWith("variants/") -> { + val content = String(data, Charsets.UTF_8) + val variant = parseVariantFile(p, content, meta.levels) + if (variant != null) variants.add(variant) + } + p.contains("/assets/") || p.startsWith("assets/") -> { + assets[p] = data + } + } + } + + if (variants.isEmpty()) { + throw BadRequestException("В архиве не найдены варианты (папка variants/)") + } + + return LabImportBundle(meta, readmeMd, variants, assets) + } + + private fun parseLevels(tree: JsonNode): List { + val levels = tree.path("levels") + if (levels.isArray && levels.size() > 0) { + return levels.map { n -> + LabLevelMeta( + code = n.path("code").asText(), + title = n.path("title").asText(""), + description = n.path("description").asText(""), + position = n.path("position").asInt(0), + ) + } + } + return listOf( + LabLevelMeta("basic", "Основная группа", position = 1), + LabLevelMeta("advanced", "Повышенная сложность", position = 2), + ) + } + + private fun parseVariantsFromTree(tree: JsonNode, levels: List): List { + val variants = tree.path("variants") + if (!variants.isArray) return emptyList() + val levelMap = levels.associateBy { it.code } + return variants.map { v -> + val levelCode = normalizeLevel(v.path("level").asText("basic")) + if (!levelMap.containsKey(levelCode)) { + throw BadRequestException("Неизвестный уровень: ${v.path("level").asText()}") + } + VariantMeta( + level = levelCode, + number = v.path("number").asText(), + title = v.path("title").asText(""), + statement = v.path("statement").asText(""), + ) + } + } + + private fun parseVariantFile(path: String, content: String, levels: List): VariantMeta? { + val levelMap = levels.associateBy { it.code } + val lines = content.lines() + val firstSep = lines.indexOfFirst { it.trim() == "---" } + if (firstSep != 0) { + return VariantMeta( + level = "basic", + number = path.substringAfterLast("/").removeSuffix(".md"), + title = "", + statement = content.trim(), + ) + } + val secondSep = lines.withIndex().firstOrNull { it.index != firstSep && it.value.trim() == "---" }?.index ?: -1 + if (secondSep < 0) return null + val fmLines = lines.subList(1, secondSep) + val fm = mutableMapOf() + for (line in fmLines) { + val parts = line.split(":", limit = 2) + if (parts.size == 2) fm[parts[0].trim()] = parts[1].trim() + } + val levelCode = normalizeLevel(fm["level"] ?: "basic") + if (levelMap[levelCode] == null) return null + val body = lines.drop(secondSep + 1).joinToString("\n").trim() + return VariantMeta( + level = levelCode, + number = fm["number"] ?: return null, + title = fm["title"] ?: "", + statement = body.ifBlank { "—" }, + ) + } + + private fun normalizeLevel(s: String): String = when (s.lowercase().trim()) { + "main", "basic", "обычная", "основная" -> "basic" + "advanced", "повышенная", "повышенной", "hard" -> "advanced" + else -> s.lowercase().trim() + } +} \ No newline at end of file diff --git a/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/lab/LabService.kt b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/lab/LabService.kt new file mode 100644 index 0000000..dc5d92c --- /dev/null +++ b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/lab/LabService.kt @@ -0,0 +1,137 @@ +package ru.ysu.lms.academic.lab + +import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Transactional +import ru.ysu.lms.academic.domain.Lab +import ru.ysu.lms.academic.domain.LabLevel +import ru.ysu.lms.academic.domain.Variant +import ru.ysu.lms.academic.repo.LabLevelRepository +import ru.ysu.lms.academic.repo.LabRepository +import ru.ysu.lms.academic.repo.SemesterRepository +import ru.ysu.lms.academic.repo.VariantRepository +import ru.ysu.lms.common.NotFoundException +import ru.ysu.lms.common.BadRequestException +import java.math.BigDecimal +import java.util.UUID + +@Service +class LabService( + private val labs: LabRepository, + private val labLevels: LabLevelRepository, + private val variantsRepo: VariantRepository, + private val semesters: SemesterRepository, + private val parser: LabImportParser, +) { + + @Transactional + fun importFromFile(filename: String, bytes: ByteArray): LabImportResult { + val bundle = parser.parse(filename, bytes) + val semester = semesters.findFirstByActiveTrue() + ?: throw BadRequestException("Нет активного семестра. Создайте семестр.") + + val lab = labs.save(Lab( + number = bundle.meta.number, + title = bundle.meta.title, + semester = semester, + descriptionMd = bundle.descriptionMd, + pointsMax = bundle.meta.pointsMax, + status = bundle.meta.status, + )) + + val levelMetas = bundle.meta.levels.ifEmpty { + listOf( + LabLevelMeta("basic", "Основная группа", position = 1), + LabLevelMeta("advanced", "Повышенная сложность", position = 2), + ) + } + val levelEntities = levelMetas.map { meta -> + labLevels.save(LabLevel( + lab = lab, + code = meta.code, + title = meta.title, + description = meta.description, + position = meta.position, + pointsMax = meta.pointsMax, + )) + } + + val levelByCode = levelEntities.associateBy { it.code } + + bundle.variants.forEach { vmeta -> + val level = levelByCode[vmeta.level] + ?: throw BadRequestException("Неизвестный уровень ${vmeta.level} у варианта ${vmeta.number}") + variantsRepo.save(Variant( + lab = lab, + labLevel = level, + number = vmeta.number, + title = vmeta.title, + statementMd = vmeta.statement, + )) + } + + return LabImportResult( + labId = lab.id.toString(), + number = lab.number, + title = lab.title, + levelCount = levelEntities.size, + variantCount = bundle.variants.size, + ) + } + + @Transactional(readOnly = true) + fun list(): List = + labs.findAllByOrderByNumberAsc().map { lab -> + val variants = variantsRepo.findByLabIdOrderByNumber(lab.id) + LabSummary( + id = lab.id.toString(), + number = lab.number, + title = lab.title, + status = lab.status, + semesterTitle = lab.semester?.let { "${it.title} ${it.year}" } ?: "—", + deadlineAt = lab.deadlineAt?.toString(), + defenseAt = lab.defenseAt?.toString(), + pointsMax = lab.pointsMax, + variantCount = variants.size, + ) + } + + @Transactional(readOnly = true) + fun detail(labId: UUID): LabDetail { + val lab = labs.findById(labId).orElseThrow { NotFoundException("Лабораторная не найдена") } + val levels = labLevels.findByLabIdOrderByPosition(lab.id) + return LabDetail( + id = lab.id.toString(), + number = lab.number, + title = lab.title, + status = lab.status, + descriptionMd = lab.descriptionMd, + deadlineAt = lab.deadlineAt?.toString(), + defenseAt = lab.defenseAt?.toString(), + pointsMax = lab.pointsMax, + levels = levels.map { level -> + val vs = variantsRepo.findByLabIdOrderByNumber(lab.id) + .filter { it.labLevel?.id == level.id } + LabLevelDetail( + code = level.code, + title = level.title, + variants = vs.map { v -> + VariantDetail( + id = v.id.toString(), + number = v.number, + title = v.title, + statementMd = v.statementMd, + ) + }, + ) + }, + ) + } + + @Transactional + fun delete(labId: UUID) { + if (!labs.existsById(labId)) { + throw NotFoundException("Лабораторная не найдена") + } + labs.deleteById(labId) + } +} \ No newline at end of file diff --git a/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/repo/LabRepository.kt b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/repo/LabRepository.kt new file mode 100644 index 0000000..e2fddee --- /dev/null +++ b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/repo/LabRepository.kt @@ -0,0 +1,9 @@ +package ru.ysu.lms.academic.repo + +import org.springframework.data.jpa.repository.JpaRepository +import ru.ysu.lms.academic.domain.Lab +import java.util.UUID + +interface LabRepository : JpaRepository { + fun findAllByOrderByNumberAsc(): List +} \ No newline at end of file diff --git a/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/repo/SemesterRepository.kt b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/repo/SemesterRepository.kt new file mode 100644 index 0000000..c93b67a --- /dev/null +++ b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/repo/SemesterRepository.kt @@ -0,0 +1,9 @@ +package ru.ysu.lms.academic.repo + +import org.springframework.data.jpa.repository.JpaRepository +import ru.ysu.lms.academic.domain.Semester +import java.util.UUID + +interface SemesterRepository : JpaRepository { + fun findFirstByActiveTrue(): Semester? +} \ No newline at end of file diff --git a/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/repo/VariantRepository.kt b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/repo/VariantRepository.kt new file mode 100644 index 0000000..8b5da1e --- /dev/null +++ b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/repo/VariantRepository.kt @@ -0,0 +1,14 @@ +package ru.ysu.lms.academic.repo + +import org.springframework.data.jpa.repository.JpaRepository +import ru.ysu.lms.academic.domain.LabLevel +import ru.ysu.lms.academic.domain.Variant +import java.util.UUID + +interface LabLevelRepository : JpaRepository { + fun findByLabIdOrderByPosition(labId: UUID): List +} + +interface VariantRepository : JpaRepository { + fun findByLabIdOrderByNumber(labId: UUID): List +} \ No newline at end of file diff --git a/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/security/SecurityConfig.kt b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/security/SecurityConfig.kt new file mode 100644 index 0000000..c090677 --- /dev/null +++ b/services/academic-service/src/main/kotlin/ru/ysu/lms/academic/security/SecurityConfig.kt @@ -0,0 +1,60 @@ +package ru.ysu.lms.academic.security + +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.core.convert.converter.Converter +import org.springframework.security.authentication.AbstractAuthenticationToken +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity +import org.springframework.security.config.annotation.web.builders.HttpSecurity +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity +import org.springframework.security.config.http.SessionCreationPolicy +import org.springframework.security.core.GrantedAuthority +import org.springframework.security.core.authority.SimpleGrantedAuthority +import org.springframework.security.oauth2.jwt.Jwt +import org.springframework.security.oauth2.jwt.JwtDecoder +import org.springframework.security.oauth2.jwt.NimbusJwtDecoder +import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter +import org.springframework.security.web.SecurityFilterChain + +@Configuration +@EnableWebSecurity +@EnableMethodSecurity +class SecurityConfig { + + @Bean + fun jwtDecoder(): JwtDecoder = + NimbusJwtDecoder.withJwkSetUri(JWK_URI).build() + + @Bean + fun jwtAuthenticationConverter(): Converter { + val converter = JwtAuthenticationConverter() + converter.setJwtGrantedAuthoritiesConverter { jwt -> + val role = jwt.getClaimAsString("role") + if (role.isNullOrBlank()) emptyList() + else listOf(SimpleGrantedAuthority("ROLE_$role")) + } + return converter + } + + @Bean + fun securityFilterChain(http: HttpSecurity): SecurityFilterChain { + http + .csrf { it.disable() } + .cors { it.disable() } + .sessionManagement { it.sessionCreationPolicy(SessionCreationPolicy.STATELESS) } + .authorizeHttpRequests { auth -> + auth.requestMatchers("/actuator/**", "/v3/api-docs/**", "/swagger-ui/**").permitAll() + auth.anyRequest().authenticated() + } + .oauth2ResourceServer { oauth -> + oauth.jwt { jwt -> + jwt.jwtAuthenticationConverter(jwtAuthenticationConverter()) + } + } + return http.build() + } + + companion object { + private val JWK_URI = System.getenv("LMS_JWT_JWK_SET_URI") ?: "http://localhost:8081/api/v1/auth/jwks.json" + } +} \ No newline at end of file diff --git a/services/academic-service/src/main/resources/application.yml b/services/academic-service/src/main/resources/application.yml new file mode 100644 index 0000000..b89dd59 --- /dev/null +++ b/services/academic-service/src/main/resources/application.yml @@ -0,0 +1,37 @@ +server: + port: ${SERVER_PORT:8082} + +spring: + application: + name: academic-service + datasource: + url: ${LMS_DB_URL:jdbc:postgresql://localhost:5432/lms?currentSchema=academic} + username: ${LMS_DB_USER:lms} + password: ${LMS_DB_PASSWORD:lms} + jpa: + open-in-view: false + hibernate: + ddl-auto: validate + properties: + hibernate: + default_schema: academic + flyway: + enabled: true + locations: classpath:db/migration + schemas: academic + default-schema: academic + create-schemas: true + +management: + endpoints: + web: + exposure: + include: health,info + endpoint: + health: + probes: + enabled: true + +springdoc: + api-docs: + path: /v3/api-docs diff --git a/services/academic-service/src/main/resources/db/migration/V1__init.sql b/services/academic-service/src/main/resources/db/migration/V1__init.sql new file mode 100644 index 0000000..317e46f --- /dev/null +++ b/services/academic-service/src/main/resources/db/migration/V1__init.sql @@ -0,0 +1,2 @@ +-- Baseline for the academic schema (courses, articles, labs, levels, variants). +CREATE SCHEMA IF NOT EXISTS academic; diff --git a/services/academic-service/src/main/resources/db/migration/V2__schema.sql b/services/academic-service/src/main/resources/db/migration/V2__schema.sql new file mode 100644 index 0000000..7214937 --- /dev/null +++ b/services/academic-service/src/main/resources/db/migration/V2__schema.sql @@ -0,0 +1,88 @@ +-- Courses, articles, semesters, labs, levels, variants for the academic service. + +CREATE TABLE courses ( + id uuid PRIMARY KEY DEFAULT uuidv7(), + title varchar(200) NOT NULL, + summary text NOT NULL DEFAULT '', + position integer NOT NULL DEFAULT 0, + published boolean NOT NULL DEFAULT false, + created_at timestamptz NOT NULL DEFAULT now() +); + +CREATE TABLE articles ( + id uuid PRIMARY KEY DEFAULT uuidv7(), + course_id uuid NOT NULL REFERENCES courses(id) ON DELETE CASCADE, + title varchar(200) NOT NULL, + slug varchar(200) NOT NULL, + summary text NOT NULL DEFAULT '', + body_md text NOT NULL DEFAULT '', + status varchar(16) NOT NULL DEFAULT 'draft', + position integer NOT NULL DEFAULT 0, + published_at timestamptz, + created_by uuid, + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now(), + CONSTRAINT articles_course_slug_unique UNIQUE (course_id, slug) +); + +CREATE TABLE article_assets ( + id uuid PRIMARY KEY DEFAULT uuidv7(), + article_id uuid REFERENCES articles(id) ON DELETE CASCADE, + filename varchar(255) NOT NULL, + stored_path varchar(512) NOT NULL, + mime varchar(128) NOT NULL DEFAULT '', + size bigint NOT NULL DEFAULT 0, + created_at timestamptz NOT NULL DEFAULT now() +); + +CREATE TABLE semesters ( + id uuid PRIMARY KEY DEFAULT uuidv7(), + title varchar(100) NOT NULL, + year integer NOT NULL, + active boolean NOT NULL DEFAULT false +); + +CREATE TABLE labs ( + id uuid PRIMARY KEY DEFAULT uuidv7(), + number integer NOT NULL, + title varchar(200) NOT NULL, + semester_id uuid NOT NULL REFERENCES semesters(id) ON DELETE RESTRICT, + description_md text NOT NULL DEFAULT '', + deadline_at timestamptz, + defense_at timestamptz, + points_max numeric(4,1) NOT NULL DEFAULT 5, + status varchar(16) NOT NULL DEFAULT 'draft', + created_at timestamptz NOT NULL DEFAULT now(), + CONSTRAINT labs_number_semester_unique UNIQUE (number, semester_id) +); + +CREATE TABLE lab_levels ( + id uuid PRIMARY KEY DEFAULT uuidv7(), + lab_id uuid NOT NULL REFERENCES labs(id) ON DELETE CASCADE, + code varchar(32) NOT NULL, + title varchar(100) NOT NULL, + description text NOT NULL DEFAULT '', + position integer NOT NULL DEFAULT 0, + points_max numeric(4,1), + CONSTRAINT lab_levels_lab_code_unique UNIQUE (lab_id, code) +); + +CREATE TABLE variants ( + id uuid PRIMARY KEY DEFAULT uuidv7(), + lab_id uuid NOT NULL REFERENCES labs(id) ON DELETE CASCADE, + lab_level_id uuid NOT NULL REFERENCES lab_levels(id) ON DELETE CASCADE, + number varchar(32) NOT NULL, + title varchar(200) NOT NULL DEFAULT '', + statement_md text NOT NULL DEFAULT '', + position integer NOT NULL DEFAULT 0, + CONSTRAINT variants_lab_level_number_unique UNIQUE (lab_id, lab_level_id, number) +); + +CREATE TABLE variant_examples ( + id uuid PRIMARY KEY DEFAULT uuidv7(), + variant_id uuid NOT NULL REFERENCES variants(id) ON DELETE CASCADE, + position integer NOT NULL DEFAULT 0, + input text NOT NULL DEFAULT '', + output text NOT NULL DEFAULT '', + explanation text NOT NULL DEFAULT '' +); \ No newline at end of file diff --git a/services/academic-service/src/main/resources/db/migration/V3__seed.sql b/services/academic-service/src/main/resources/db/migration/V3__seed.sql new file mode 100644 index 0000000..d3692e7 --- /dev/null +++ b/services/academic-service/src/main/resources/db/migration/V3__seed.sql @@ -0,0 +1,4 @@ +-- Seed data: default semester for development. +INSERT INTO semesters (id, title, year, active) +VALUES ('00000000-0000-7000-8000-000000000001', 'осень', 2026, true) +ON CONFLICT DO NOTHING; \ No newline at end of file diff --git a/services/gateway/build.gradle.kts b/services/gateway/build.gradle.kts new file mode 100644 index 0000000..bada42b --- /dev/null +++ b/services/gateway/build.gradle.kts @@ -0,0 +1,19 @@ +plugins { + id("lms.spring-boot") +} + +dependencies { + implementation(platform(libs.springBootBom)) + implementation(platform(libs.springCloudBom)) + + implementation(libs.springCloudStarterGatewayWebflux) + implementation(libs.springBootStarterActuator) + + implementation(project(":libs:security-jwt")) + + testImplementation(project(":libs:test-support")) +} + +springBoot { + mainClass.set("ru.ysu.lms.gateway.GatewayApplicationKt") +} diff --git a/services/gateway/src/main/kotlin/ru/ysu/lms/gateway/GatewayApplication.kt b/services/gateway/src/main/kotlin/ru/ysu/lms/gateway/GatewayApplication.kt new file mode 100644 index 0000000..a4434e8 --- /dev/null +++ b/services/gateway/src/main/kotlin/ru/ysu/lms/gateway/GatewayApplication.kt @@ -0,0 +1,11 @@ +package ru.ysu.lms.gateway + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication + +@SpringBootApplication +class GatewayApplication + +fun main(args: Array) { + runApplication(*args) +} diff --git a/services/gateway/src/main/kotlin/ru/ysu/lms/gateway/security/JwtAuthenticationFilter.kt b/services/gateway/src/main/kotlin/ru/ysu/lms/gateway/security/JwtAuthenticationFilter.kt new file mode 100644 index 0000000..342d0d5 --- /dev/null +++ b/services/gateway/src/main/kotlin/ru/ysu/lms/gateway/security/JwtAuthenticationFilter.kt @@ -0,0 +1,66 @@ +package ru.ysu.lms.gateway.security + +import org.springframework.cloud.gateway.filter.GatewayFilterChain +import org.springframework.cloud.gateway.filter.GlobalFilter +import org.springframework.core.Ordered +import org.springframework.http.HttpStatus +import org.springframework.http.MediaType +import org.springframework.security.oauth2.jwt.JwtDecoder +import org.springframework.security.oauth2.jwt.JwtException +import org.springframework.stereotype.Component +import org.springframework.web.server.ServerWebExchange +import reactor.core.publisher.Mono + +/** + * Validates the bearer token on every routed request and forwards the resolved + * identity to the downstream services as `X-Account-*` headers. + */ +@Component +class JwtAuthenticationFilter(private val jwtDecoder: JwtDecoder) : GlobalFilter, Ordered { + + override fun filter(exchange: ServerWebExchange, chain: GatewayFilterChain): Mono { + val path = exchange.request.path.value() + if (isPublic(path)) { + return chain.filter(exchange) + } + val token = bearerToken(exchange) + ?: return unauthorized(exchange, "Требуется вход") + return try { + val jwt = jwtDecoder.decode(token) + val request = exchange.request.mutate() + .header("X-Account-Id", jwt.subject.orEmpty()) + .header("X-Account-Login", jwt.getClaimAsString("login").orEmpty()) + .header("X-Account-Role", jwt.getClaimAsString("role").orEmpty()) + .build() + chain.filter(exchange.mutate().request(request).build()) + } catch (_: JwtException) { + unauthorized(exchange, "Недействительный или истёкший токен") + } + } + + override fun getOrder(): Int = -100 + + private fun isPublic(path: String): Boolean = + path.startsWith("/actuator") || + path == "/api/v1/auth/login" || + path == "/api/v1/auth/setup" || + path == "/api/v1/auth/health" || + path == "/api/v1/auth/jwks.json" + + private fun bearerToken(exchange: ServerWebExchange): String? { + val header = exchange.request.headers.getFirst("Authorization") ?: return null + if (!header.startsWith("Bearer ")) { + return null + } + return header.removePrefix("Bearer ").trim().ifBlank { null } + } + + private fun unauthorized(exchange: ServerWebExchange, message: String): Mono { + val response = exchange.response + response.statusCode = HttpStatus.UNAUTHORIZED + response.headers.contentType = MediaType.APPLICATION_JSON + val body = """{"status":401,"title":"Unauthorized","detail":"$message"}""" + val buffer = response.bufferFactory().wrap(body.toByteArray(Charsets.UTF_8)) + return response.writeWith(Mono.just(buffer)) + } +} diff --git a/services/gateway/src/main/resources/application.yml b/services/gateway/src/main/resources/application.yml new file mode 100644 index 0000000..d33ed5b --- /dev/null +++ b/services/gateway/src/main/resources/application.yml @@ -0,0 +1,37 @@ +server: + port: ${SERVER_PORT:8080} + +spring: + application: + name: gateway + cloud: + gateway: + server: + webflux: + routes: + - id: identity + uri: ${LMS_IDENTITY_URI:http://localhost:8081} + predicates: + - Path=/api/v1/auth/**,/api/v1/accounts/**,/api/v1/groups/**,/api/v1/students/** + - id: academic + uri: ${LMS_ACADEMIC_URI:http://localhost:8082} + predicates: + - Path=/api/v1/courses/**,/api/v1/articles/**,/api/v1/labs/**,/api/v1/assets/** + - id: progress + uri: ${LMS_PROGRESS_URI:http://localhost:8083} + predicates: + - Path=/api/v1/assignments/**,/api/v1/levels/**,/api/v1/me/**,/api/v1/distribute/** + +management: + endpoints: + web: + exposure: + include: health,info,gateway + endpoint: + health: + probes: + enabled: true + +lms: + jwt: + jwk-set-uri: ${LMS_JWT_JWK_SET_URI:http://localhost:8081/api/v1/auth/jwks.json} diff --git a/services/identity-service/build.gradle.kts b/services/identity-service/build.gradle.kts new file mode 100644 index 0000000..26fe4b3 --- /dev/null +++ b/services/identity-service/build.gradle.kts @@ -0,0 +1,31 @@ +plugins { + id("lms.spring-boot") +} + +dependencies { + implementation(platform(libs.springBootBom)) + + implementation(libs.springBootStarterWeb) + implementation(libs.springBootStarterValidation) + implementation(libs.springBootStarterActuator) + implementation(libs.springBootStarterDataJpa) + implementation(libs.springBootStarterSecurity) + implementation(libs.springBootStarterOauth2ResourceServer) + implementation(libs.springBootStarterFlyway) + implementation(libs.flywayPostgresql) + runtimeOnly(libs.postgresql) + implementation(libs.jacksonYaml) + implementation(libs.springdocStarterWebmvcUi) + implementation(libs.apachePoiOoxml) + + implementation(project(":libs:common-http")) + implementation(project(":libs:security-jwt")) + + testImplementation(project(":libs:test-support")) + testImplementation(libs.springBootStarterTest) + testImplementation(libs.springSecurityTest) +} + +springBoot { + mainClass.set("ru.ysu.lms.identity.IdentityServiceApplicationKt") +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/IdentityServiceApplication.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/IdentityServiceApplication.kt new file mode 100644 index 0000000..c422621 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/IdentityServiceApplication.kt @@ -0,0 +1,14 @@ +package ru.ysu.lms.identity + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication +import ru.ysu.lms.security.LmsSecurityAutoConfiguration + +// The identity service manages its own JWT keys at runtime, so the generic +// auto-configuration from the shared library is excluded. +@SpringBootApplication(exclude = [LmsSecurityAutoConfiguration::class]) +class IdentityServiceApplication + +fun main(args: Array) { + runApplication(*args) +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/AuthController.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/AuthController.kt new file mode 100644 index 0000000..b36911c --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/AuthController.kt @@ -0,0 +1,50 @@ +package ru.ysu.lms.identity.auth + +import com.nimbusds.jose.jwk.JWKSet +import com.nimbusds.jose.jwk.RSAKey +import jakarta.validation.Valid +import org.springframework.security.core.annotation.AuthenticationPrincipal +import org.springframework.security.oauth2.jwt.Jwt +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController +import java.util.UUID + +@RestController +@RequestMapping("/api/v1/auth") +class AuthController( + private val authService: AuthService, + private val rsaKey: RSAKey, +) { + + @GetMapping("/health") + fun health(): Map = mapOf( + "ok" to true, + "service" to "identity-service", + "adminExists" to authService.adminExists(), + ) + + @PostMapping("/setup") + fun setup(@Valid @RequestBody body: SetupRequest): AuthResponse = authService.setup(body) + + @PostMapping("/login") + fun login(@Valid @RequestBody body: LoginRequest): AuthResponse = authService.login(body) + + @GetMapping("/me") + fun me(@AuthenticationPrincipal jwt: Jwt): MeResponse = + authService.me(UUID.fromString(jwt.subject)) + + @PostMapping("/change-password") + fun changePassword( + @AuthenticationPrincipal jwt: Jwt, + @Valid @RequestBody body: ChangePasswordRequest, + ): Map { + authService.changePassword(UUID.fromString(jwt.subject), body) + return mapOf("ok" to true) + } + + @GetMapping("/jwks.json") + fun jwks(): Map = JWKSet(rsaKey).toPublicJWKSet().toJSONObject() +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/AuthDtos.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/AuthDtos.kt new file mode 100644 index 0000000..3f15085 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/AuthDtos.kt @@ -0,0 +1,45 @@ +package ru.ysu.lms.identity.auth + +import jakarta.validation.constraints.NotBlank + +data class SetupRequest( + @field:NotBlank(message = "Укажите логин") + val login: String, + @field:NotBlank(message = "Укажите пароль") + val password: String, + @field:NotBlank(message = "Повторите пароль") + val password2: String, +) + +data class LoginRequest( + @field:NotBlank(message = "Укажите логин") + val login: String, + @field:NotBlank(message = "Укажите пароль") + val password: String, +) + +data class ChangePasswordRequest( + @field:NotBlank(message = "Укажите текущий пароль") + val old: String, + @field:NotBlank(message = "Укажите новый пароль") + val new: String, + @field:NotBlank(message = "Повторите новый пароль") + val new2: String, +) + +data class AuthResponse( + val token: String, + val id: String, + val login: String, + val role: String, + val name: String, + val mustChangePassword: Boolean, +) + +data class MeResponse( + val id: String, + val login: String, + val role: String, + val name: String, + val mustChangePassword: Boolean, +) diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/AuthService.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/AuthService.kt new file mode 100644 index 0000000..1d4c0ad --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/AuthService.kt @@ -0,0 +1,133 @@ +package ru.ysu.lms.identity.auth + +import org.springframework.security.crypto.password.PasswordEncoder +import org.springframework.security.oauth2.jose.jws.SignatureAlgorithm +import org.springframework.security.oauth2.jwt.JwsHeader +import org.springframework.security.oauth2.jwt.JwtClaimsSet +import org.springframework.security.oauth2.jwt.JwtEncoder +import org.springframework.security.oauth2.jwt.JwtEncoderParameters +import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Transactional +import ru.ysu.lms.common.BadRequestException +import ru.ysu.lms.common.ConflictException +import ru.ysu.lms.common.NotFoundException +import ru.ysu.lms.common.UnauthorizedException +import ru.ysu.lms.identity.domain.Account +import ru.ysu.lms.identity.repo.AccountRepository +import ru.ysu.lms.identity.repo.StudentRepository +import ru.ysu.lms.security.JwtProperties +import ru.ysu.lms.security.LmsRole +import java.time.Instant +import java.util.UUID + +@Service +class AuthService( + private val accounts: AccountRepository, + private val students: StudentRepository, + private val passwordEncoder: PasswordEncoder, + private val jwtEncoder: JwtEncoder, + private val jwtProperties: JwtProperties, +) { + + fun adminExists(): Boolean = accounts.existsByRole(LmsRole.ADMIN) + + @Transactional + fun setup(request: SetupRequest): AuthResponse { + if (adminExists()) { + throw ConflictException("Аккаунт администратора уже существует") + } + val login = request.login.trim() + if (login.length < 3) { + throw BadRequestException("Логин: минимум 3 символа") + } + validatePassword(request.password, request.password2) + val account = Account( + login = login, + passwordHash = passwordEncoder.encode(request.password) ?: "", + role = LmsRole.ADMIN, + mustChangePassword = false, + ) + accounts.save(account) + return toResponse(account, account.login) + } + + @Transactional(readOnly = true) + fun login(request: LoginRequest): AuthResponse { + val account = accounts.findByLogin(request.login.trim()) + ?: throw UnauthorizedException("Неверный логин или пароль") + if (!passwordEncoder.matches(request.password, account.passwordHash)) { + throw UnauthorizedException("Неверный логин или пароль") + } + return toResponse(account, displayName(account)) + } + + @Transactional(readOnly = true) + fun me(accountId: UUID): MeResponse { + val account = accounts.findById(accountId) + .orElseThrow { NotFoundException("Пользователь не найден") } + return MeResponse( + id = account.id.toString(), + login = account.login, + role = account.role.name, + name = displayName(account), + mustChangePassword = account.mustChangePassword, + ) + } + + @Transactional + fun changePassword(accountId: UUID, request: ChangePasswordRequest) { + val account = accounts.findById(accountId) + .orElseThrow { NotFoundException("Пользователь не найден") } + if (!passwordEncoder.matches(request.old, account.passwordHash)) { + throw UnauthorizedException("Текущий пароль неверный") + } + validatePassword(request.new, request.new2) + account.passwordHash = passwordEncoder.encode(request.new) ?: account.passwordHash + account.mustChangePassword = false + account.tempPassword = null + account.updatedAt = Instant.now() + accounts.save(account) + } + + private fun validatePassword(password: String, confirmation: String) { + if (password.length < 8) { + throw BadRequestException("Пароль: минимум 8 символов") + } + if (password != confirmation) { + throw BadRequestException("Пароли не совпадают") + } + } + + private fun displayName(account: Account): String = + if (account.role == LmsRole.STUDENT) { + students.findById(account.id) + .map { it.fullName.ifBlank { account.login } } + .orElse(account.login) + } else { + account.login + } + + private fun toResponse(account: Account, name: String): AuthResponse = AuthResponse( + token = issueToken(account, name), + id = account.id.toString(), + login = account.login, + role = account.role.name, + name = name, + mustChangePassword = account.mustChangePassword, + ) + + private fun issueToken(account: Account, name: String): String { + val now = Instant.now() + val claims = JwtClaimsSet.builder() + .issuer(jwtProperties.issuer) + .issuedAt(now) + .expiresAt(now.plus(jwtProperties.accessTokenTtl)) + .subject(account.id.toString()) + .claim("role", account.role.name) + .claim("login", account.login) + .claim("name", name) + .build() + val header = JwsHeader.with(SignatureAlgorithm.RS256).build() + return jwtEncoder.encode(JwtEncoderParameters.from(header, claims)).tokenValue + } +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/Passwords.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/Passwords.kt new file mode 100644 index 0000000..71b1acb --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/auth/Passwords.kt @@ -0,0 +1,13 @@ +package ru.ysu.lms.identity.auth + +import java.security.SecureRandom + +object Passwords { + private const val ALPHABET = "abcdefghjkmnpqrstuvwxyzABCDEFGHJKMNPQRSTUVWXYZ23456789" + private val random = SecureRandom() + + fun generate(length: Int = 10): String = + buildString(length) { + repeat(length) { append(ALPHABET[random.nextInt(ALPHABET.length)]) } + } +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Account.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Account.kt new file mode 100644 index 0000000..5284fa2 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Account.kt @@ -0,0 +1,41 @@ +package ru.ysu.lms.identity.domain + +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.EnumType +import jakarta.persistence.Enumerated +import jakarta.persistence.Id +import jakarta.persistence.Table +import ru.ysu.lms.common.Ids +import ru.ysu.lms.security.LmsRole +import java.time.Instant +import java.util.UUID + +@Entity +@Table(name = "accounts") +class Account( + @Id + var id: UUID = Ids.v7(), + + @Column(nullable = false, unique = true, length = 64) + var login: String = "", + + @Column(name = "password_hash", nullable = false) + var passwordHash: String = "", + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 16) + var role: LmsRole = LmsRole.STUDENT, + + @Column(name = "must_change_password", nullable = false) + var mustChangePassword: Boolean = true, + + @Column(name = "temp_password", length = 64) + var tempPassword: String? = null, + + @Column(name = "created_at", nullable = false) + var createdAt: Instant = Instant.now(), + + @Column(name = "updated_at", nullable = false) + var updatedAt: Instant = Instant.now(), +) diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Enrollment.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Enrollment.kt new file mode 100644 index 0000000..8c74c45 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Enrollment.kt @@ -0,0 +1,30 @@ +package ru.ysu.lms.identity.domain + +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.FetchType +import jakarta.persistence.Id +import jakarta.persistence.JoinColumn +import jakarta.persistence.ManyToOne +import jakarta.persistence.Table +import ru.ysu.lms.common.Ids +import java.time.Instant +import java.util.UUID + +@Entity +@Table(name = "enrollments") +class Enrollment( + @Id + var id: UUID = Ids.v7(), + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "group_id", nullable = false) + var group: GroupEntity? = null, + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "student_id", nullable = false) + var student: Student? = null, + + @Column(name = "enrolled_at", nullable = false) + var enrolledAt: Instant = Instant.now(), +) diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/GroupEntity.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/GroupEntity.kt new file mode 100644 index 0000000..3345a2d --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/GroupEntity.kt @@ -0,0 +1,25 @@ +package ru.ysu.lms.identity.domain + +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table +import ru.ysu.lms.common.Ids +import java.time.Instant +import java.util.UUID + +@Entity +@Table(name = "groups") +class GroupEntity( + @Id + var id: UUID = Ids.v7(), + + @Column(nullable = false, unique = true, length = 100) + var name: String = "", + + @Column(name = "task_duration_min", nullable = false) + var taskDurationMin: Int = 30, + + @Column(name = "created_at", nullable = false) + var createdAt: Instant = Instant.now(), +) diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Setting.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Setting.kt new file mode 100644 index 0000000..3a26dba --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Setting.kt @@ -0,0 +1,17 @@ +package ru.ysu.lms.identity.domain + +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table + +@Entity +@Table(name = "settings") +class Setting( + @Id + @Column(name = "key", length = 100) + var key: String = "", + + @Column(name = "value", nullable = false) + var value: String = "", +) diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Student.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Student.kt new file mode 100644 index 0000000..293ff88 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/domain/Student.kt @@ -0,0 +1,47 @@ +package ru.ysu.lms.identity.domain + +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.FetchType +import jakarta.persistence.Id +import jakarta.persistence.JoinColumn +import jakarta.persistence.MapsId +import jakarta.persistence.OneToOne +import jakarta.persistence.Table +import java.util.UUID + +@Entity +@Table(name = "students") +class Student( + @Id + @Column(name = "account_id") + var accountId: UUID? = null, + + @Column(name = "student_no", nullable = false, unique = true, length = 32) + var studentNo: String = "", + + @Column(name = "last_name", nullable = false, length = 100) + var lastName: String = "", + + @Column(name = "first_name", nullable = false, length = 100) + var firstName: String = "", + + @Column(name = "middle_name", nullable = false, length = 100) + var middleName: String = "", + + @Column(name = "basis", nullable = false, length = 100) + var basis: String = "", + + @Column(name = "note", nullable = false) + var note: String = "", + + @OneToOne(fetch = FetchType.LAZY) + @MapsId + @JoinColumn(name = "account_id") + var account: Account? = null, +) { + val fullName: String + get() = listOf(lastName, firstName, middleName) + .filter { it.isNotBlank() } + .joinToString(" ") +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/AccountRepository.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/AccountRepository.kt new file mode 100644 index 0000000..abcf7f8 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/AccountRepository.kt @@ -0,0 +1,13 @@ +package ru.ysu.lms.identity.repo + +import org.springframework.data.jpa.repository.JpaRepository +import ru.ysu.lms.identity.domain.Account +import ru.ysu.lms.security.LmsRole +import java.util.UUID + +interface AccountRepository : JpaRepository { + fun findByLogin(login: String): Account? + fun existsByLogin(login: String): Boolean + fun existsByRole(role: LmsRole): Boolean + fun countByRole(role: LmsRole): Long +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/EnrollmentRepository.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/EnrollmentRepository.kt new file mode 100644 index 0000000..f09f433 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/EnrollmentRepository.kt @@ -0,0 +1,21 @@ +package ru.ysu.lms.identity.repo + +import org.springframework.data.jpa.repository.JpaRepository +import org.springframework.data.jpa.repository.Query +import org.springframework.data.repository.query.Param +import ru.ysu.lms.identity.domain.Enrollment +import java.util.UUID + +interface EnrollmentRepository : JpaRepository { + + @Query( + "select e from Enrollment e join fetch e.student s join fetch s.account where e.group.id = :groupId", + ) + fun findAllByGroupId(@Param("groupId") groupId: UUID): List + + fun findByStudent_AccountId(accountId: UUID): Enrollment? + + fun deleteByStudent_AccountId(accountId: UUID) + + fun countByGroup_Id(groupId: UUID): Long +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/GroupRepository.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/GroupRepository.kt new file mode 100644 index 0000000..bef8d88 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/GroupRepository.kt @@ -0,0 +1,11 @@ +package ru.ysu.lms.identity.repo + +import org.springframework.data.jpa.repository.JpaRepository +import ru.ysu.lms.identity.domain.GroupEntity +import java.util.UUID + +interface GroupRepository : JpaRepository { + fun findByName(name: String): GroupEntity? + fun existsByName(name: String): Boolean + fun findAllByOrderByNameAsc(): List +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/SettingRepository.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/SettingRepository.kt new file mode 100644 index 0000000..6e74de7 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/SettingRepository.kt @@ -0,0 +1,6 @@ +package ru.ysu.lms.identity.repo + +import org.springframework.data.jpa.repository.JpaRepository +import ru.ysu.lms.identity.domain.Setting + +interface SettingRepository : JpaRepository diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/StudentRepository.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/StudentRepository.kt new file mode 100644 index 0000000..9674828 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/repo/StudentRepository.kt @@ -0,0 +1,10 @@ +package ru.ysu.lms.identity.repo + +import org.springframework.data.jpa.repository.JpaRepository +import ru.ysu.lms.identity.domain.Student +import java.util.UUID + +interface StudentRepository : JpaRepository { + fun findByStudentNo(studentNo: String): Student? + fun existsByStudentNo(studentNo: String): Boolean +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/CredentialsExporter.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/CredentialsExporter.kt new file mode 100644 index 0000000..244292a --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/CredentialsExporter.kt @@ -0,0 +1,53 @@ +package ru.ysu.lms.identity.roster + +import org.apache.poi.xssf.usermodel.XSSFWorkbook +import java.io.ByteArrayOutputStream + +object CredentialsExporter { + + private val HEADERS = listOf("ФИО", "Логин", "Пароль", "Статус") + + fun csv(rows: List): ByteArray { + val builder = StringBuilder() + builder.append(HEADERS.joinToString(";")).append("\r\n") + rows.forEach { row -> + builder.append( + listOf( + row.fullName, + row.studentNo, + row.tempPassword ?: "—", + status(row), + ).joinToString(";") { escapeCsv(it) }, + ).append("\r\n") + } + return ("\uFEFF" + builder).toByteArray(Charsets.UTF_8) + } + + fun xlsx(rows: List): ByteArray { + XSSFWorkbook().use { workbook -> + val sheet = workbook.createSheet("Логины") + val header = sheet.createRow(0) + HEADERS.forEachIndexed { index, title -> header.createCell(index).setCellValue(title) } + rows.forEachIndexed { index, row -> + val cells = sheet.createRow(index + 1) + cells.createCell(0).setCellValue(row.fullName) + cells.createCell(1).setCellValue(row.studentNo) + cells.createCell(2).setCellValue(row.tempPassword ?: "—") + cells.createCell(3).setCellValue(status(row)) + } + val out = ByteArrayOutputStream() + workbook.write(out) + return out.toByteArray() + } + } + + private fun status(row: StudentRow): String = + if (row.mustChangePassword) "ожидает первую смену пароля" else "пароль изменён" + + private fun escapeCsv(value: String): String = + if (value.contains(';') || value.contains('"') || value.contains('\n')) { + "\"" + value.replace("\"", "\"\"") + "\"" + } else { + value + } +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/GroupController.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/GroupController.kt new file mode 100644 index 0000000..2b00567 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/GroupController.kt @@ -0,0 +1,58 @@ +package ru.ysu.lms.identity.roster + +import jakarta.validation.Valid +import org.springframework.http.HttpHeaders +import org.springframework.http.MediaType +import org.springframework.http.ResponseEntity +import org.springframework.security.access.prepost.PreAuthorize +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestBody +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestParam +import org.springframework.web.bind.annotation.RestController +import org.springframework.web.multipart.MultipartFile +import ru.ysu.lms.common.BadRequestException +import java.net.URLEncoder +import java.nio.charset.StandardCharsets +import java.util.UUID + +@RestController +@RequestMapping("/api/v1/groups") +@PreAuthorize("hasRole('ADMIN')") +class GroupController(private val groupService: GroupService) { + + @GetMapping + fun list(): List = groupService.list() + + @PostMapping + fun create(@Valid @RequestBody body: CreateGroupRequest): GroupSummary = groupService.create(body) + + @PostMapping("/import") + fun import( + @RequestParam("file") file: MultipartFile, + @RequestParam(name = "name", required = false) name: String?, + ): ImportResult { + if (file.isEmpty) { + throw BadRequestException("Выберите файл со списком группы") + } + return groupService.import(name, file.originalFilename ?: "group.xlsx", file.bytes) + } + + @GetMapping("/{id}") + fun detail(@PathVariable id: UUID): GroupDetail = groupService.detail(id) + + @GetMapping("/{id}/credentials") + fun credentials( + @PathVariable id: UUID, + @RequestParam(defaultValue = "xlsx") format: String, + ): ResponseEntity { + val export = groupService.credentials(id, format) + val encodedName = URLEncoder.encode(export.filename, StandardCharsets.UTF_8).replace("+", "%20") + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename*=UTF-8''$encodedName") + .contentType(MediaType.parseMediaType(export.contentType)) + .body(export.bytes) + } +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/GroupService.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/GroupService.kt new file mode 100644 index 0000000..ec5c156 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/GroupService.kt @@ -0,0 +1,175 @@ +package ru.ysu.lms.identity.roster + +import org.springframework.security.crypto.password.PasswordEncoder +import org.springframework.stereotype.Service +import org.springframework.transaction.annotation.Transactional +import ru.ysu.lms.common.BadRequestException +import ru.ysu.lms.common.ConflictException +import ru.ysu.lms.common.NotFoundException +import ru.ysu.lms.identity.auth.Passwords +import ru.ysu.lms.identity.domain.Account +import ru.ysu.lms.identity.domain.Enrollment +import ru.ysu.lms.identity.domain.GroupEntity +import ru.ysu.lms.identity.domain.Student +import ru.ysu.lms.identity.repo.AccountRepository +import ru.ysu.lms.identity.repo.EnrollmentRepository +import ru.ysu.lms.identity.repo.GroupRepository +import ru.ysu.lms.identity.repo.StudentRepository +import ru.ysu.lms.security.LmsRole +import java.util.UUID + +@Service +class GroupService( + private val groups: GroupRepository, + private val enrollments: EnrollmentRepository, + private val students: StudentRepository, + private val accounts: AccountRepository, + private val passwordEncoder: PasswordEncoder, + private val parser: StudentImportParser, +) { + + @Transactional(readOnly = true) + fun list(): List = groups.findAllByOrderByNameAsc().map { summary(it) } + + @Transactional + fun create(request: CreateGroupRequest): GroupSummary { + val name = request.name.trim() + if (groups.existsByName(name)) { + throw ConflictException("Группа «$name» уже существует") + } + return summary(groups.save(GroupEntity(name = name))) + } + + @Transactional + fun import(requestedName: String?, filename: String, bytes: ByteArray): ImportResult { + val parsed = parser.parse(filename, bytes) + val groupName = requestedName?.trim().takeUnless { it.isNullOrBlank() } ?: parsed.groupName + val group = groups.findByName(groupName) ?: groups.save(GroupEntity(name = groupName)) + val added = mutableListOf() + val updated = mutableListOf() + + parsed.students.forEach { parsedStudent -> + val existing = students.findByStudentNo(parsedStudent.studentNo) + val student = if (existing != null) { + existing.lastName = parsedStudent.lastName + existing.firstName = parsedStudent.firstName + existing.middleName = parsedStudent.middleName + existing.basis = parsedStudent.basis + existing.note = parsedStudent.note + students.save(existing) + updated.add(parsedStudent.studentNo) + existing + } else { + val password = Passwords.generate() + val account = accounts.save( + Account( + login = parsedStudent.studentNo, + passwordHash = passwordEncoder.encode(password) ?: "", + role = LmsRole.STUDENT, + mustChangePassword = true, + tempPassword = password, + ), + ) + val created = Student( + studentNo = parsedStudent.studentNo, + lastName = parsedStudent.lastName, + firstName = parsedStudent.firstName, + middleName = parsedStudent.middleName, + basis = parsedStudent.basis, + note = parsedStudent.note, + ) + created.account = account + students.save(created) + added.add( + Credential( + id = account.id.toString(), + studentNo = parsedStudent.studentNo, + fullName = parsedStudent.fullName, + password = password, + ), + ) + created + } + + val accountId = student.accountId!! + val enrollment = enrollments.findByStudent_AccountId(accountId) + if (enrollment == null) { + enrollments.save(Enrollment(group = group, student = student)) + } else { + enrollment.group = group + enrollments.save(enrollment) + } + } + return ImportResult(group.id.toString(), group.name, added, updated) + } + + @Transactional(readOnly = true) + fun detail(groupId: UUID): GroupDetail { + val group = groups.findById(groupId).orElseThrow { NotFoundException("Группа не найдена") } + val rows = enrollments.findAllByGroupId(groupId).map { enrollment -> + val student = enrollment.student!! + val account = student.account!! + StudentRow( + id = account.id.toString(), + studentNo = student.studentNo, + fullName = student.fullName, + basis = student.basis, + mustChangePassword = account.mustChangePassword, + tempPassword = account.tempPassword, + ) + }.sortedWith(Comparator { a, b -> studentNoComparator.compare(a.studentNo, b.studentNo) }) + return GroupDetail(group.id.toString(), group.name, group.taskDurationMin, rows) + } + + @Transactional + fun resetPassword(studentAccountId: UUID): ResetPasswordResponse { + val student = students.findById(studentAccountId) + .orElseThrow { NotFoundException("Студент не найден") } + val account = student.account ?: throw NotFoundException("Аккаунт студента не найден") + val password = Passwords.generate() + account.passwordHash = passwordEncoder.encode(password) ?: account.passwordHash + account.mustChangePassword = true + account.tempPassword = password + accounts.save(account) + return ResetPasswordResponse(password) + } + + @Transactional(readOnly = true) + fun credentials(groupId: UUID, format: String): ExportFile { + val detail = detail(groupId) + val safeName = detail.name.replace(Regex("[^\\p{L}\\p{N}._-]+"), "_") + return when (format.lowercase()) { + "csv" -> ExportFile( + bytes = CredentialsExporter.csv(detail.students), + filename = "credentials_$safeName.csv", + contentType = "text/csv; charset=utf-8", + ) + "xlsx" -> ExportFile( + bytes = CredentialsExporter.xlsx(detail.students), + filename = "credentials_$safeName.xlsx", + contentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", + ) + else -> throw BadRequestException("Формат должен быть xlsx или csv") + } + } + + private fun summary(group: GroupEntity): GroupSummary = GroupSummary( + id = group.id.toString(), + name = group.name, + studentCount = enrollments.countByGroup_Id(group.id), + taskDurationMin = group.taskDurationMin, + ) + + private companion object { + val studentNoComparator = Comparator { a, b -> + val left = a.toIntOrNull() + val right = b.toIntOrNull() + when { + left != null && right != null -> left.compareTo(right) + left != null -> -1 + right != null -> 1 + else -> a.compareTo(b) + } + } + } +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/RosterDtos.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/RosterDtos.kt new file mode 100644 index 0000000..2d96d1c --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/RosterDtos.kt @@ -0,0 +1,55 @@ +package ru.ysu.lms.identity.roster + +import jakarta.validation.constraints.NotBlank + +data class GroupSummary( + val id: String, + val name: String, + val studentCount: Long, + val taskDurationMin: Int, +) + +data class CreateGroupRequest( + @field:NotBlank(message = "Укажите название группы") + val name: String, +) + +data class StudentRow( + val id: String, + val studentNo: String, + val fullName: String, + val basis: String, + val mustChangePassword: Boolean, + val tempPassword: String?, +) + +data class GroupDetail( + val id: String, + val name: String, + val taskDurationMin: Int, + val students: List, +) + +data class Credential( + val id: String, + val studentNo: String, + val fullName: String, + val password: String, +) + +data class ImportResult( + val groupId: String, + val groupName: String, + val added: List, + val updated: List, +) + +data class ResetPasswordResponse( + val password: String, +) + +class ExportFile( + val bytes: ByteArray, + val filename: String, + val contentType: String, +) diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/StudentController.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/StudentController.kt new file mode 100644 index 0000000..b0e5e68 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/StudentController.kt @@ -0,0 +1,18 @@ +package ru.ysu.lms.identity.roster + +import org.springframework.security.access.prepost.PreAuthorize +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RestController +import java.util.UUID + +@RestController +@RequestMapping("/api/v1/students") +@PreAuthorize("hasRole('ADMIN')") +class StudentController(private val groupService: GroupService) { + + @PostMapping("/{id}/reset-password") + fun resetPassword(@PathVariable id: UUID): ResetPasswordResponse = + groupService.resetPassword(id) +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/StudentImportParser.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/StudentImportParser.kt new file mode 100644 index 0000000..f1a1765 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/roster/StudentImportParser.kt @@ -0,0 +1,160 @@ +package ru.ysu.lms.identity.roster + +import org.apache.poi.ss.usermodel.DataFormatter +import org.apache.poi.ss.usermodel.WorkbookFactory +import org.springframework.stereotype.Component +import ru.ysu.lms.common.BadRequestException +import java.io.ByteArrayInputStream + +data class ParsedStudent( + val studentNo: String, + val lastName: String, + val firstName: String, + val middleName: String, + val basis: String, + val note: String, +) { + val fullName: String + get() = listOf(lastName, firstName, middleName).filter { it.isNotBlank() }.joinToString(" ") +} + +data class ParsedGroup( + val groupName: String, + val students: List, +) + +@Component +class StudentImportParser { + + fun parse(filename: String, bytes: ByteArray): ParsedGroup { + val lower = filename.lowercase() + return when { + lower.endsWith(".csv") -> parseRows(filename, parseCsv(bytes)) + lower.endsWith(".xls") || lower.endsWith(".xlsx") -> parseRows(filename, parseExcel(bytes)) + else -> throw BadRequestException("Поддерживаются файлы .xls, .xlsx и .csv") + } + } + + private fun parseExcel(bytes: ByteArray): List> { + WorkbookFactory.create(ByteArrayInputStream(bytes)).use { workbook -> + val sheet = workbook.getSheetAt(0) + val formatter = DataFormatter() + return (0..sheet.lastRowNum).map { rowIndex -> + val row = sheet.getRow(rowIndex) ?: return@map emptyList() + val cells = mutableListOf() + for (col in 0 until row.lastCellNum.toInt()) { + cells.add(formatter.formatCellValue(row.getCell(col)).trim()) + } + cells + } + } + } + + private fun parseCsv(bytes: ByteArray): List> { + val text = bytes.toString(Charsets.UTF_8).removePrefix("\uFEFF") + val lines = text.split(Regex("\r?\n")).filter { it.isNotBlank() } + if (lines.isEmpty()) { + throw BadRequestException("Файл пуст") + } + val delimiter = detectDelimiter(lines.first()) + return lines.map { splitCsvLine(it, delimiter) } + } + + private fun detectDelimiter(header: String): Char { + val candidates = listOf(';', ',', '\t') + return candidates.maxByOrNull { header.count { ch -> ch == it } } ?: ';' + } + + private fun splitCsvLine(line: String, delimiter: Char): List { + val result = mutableListOf() + val current = StringBuilder() + var inQuotes = false + for (ch in line) { + when { + ch == '"' -> inQuotes = !inQuotes + ch == delimiter && !inQuotes -> { + result.add(current.toString().trim()) + current.clear() + } + else -> current.append(ch) + } + } + result.add(current.toString().trim()) + return result + } + + private fun parseRows(filename: String, rows: List>): ParsedGroup { + val headerIndex = rows.indexOfFirst { row -> row.any { isStudentHeader(it) } } + if (headerIndex < 0) { + throw BadRequestException("Не найден столбец «Студенческий номер». Проверьте шапку таблицы.") + } + val columns = mapColumns(rows[headerIndex]) + if (columns["studentNo"] == null) { + throw BadRequestException("Не найден столбец «Студенческий номер»") + } + val students = rows.drop(headerIndex + 1).mapNotNull { row -> + fun cell(key: String): String = columns[key]?.let { row.getOrNull(it) }.orEmpty().trim() + val studentNo = normalizeNumber(cell("studentNo")) + val lastName = cell("lastName") + if (studentNo.isBlank() && lastName.isBlank()) { + return@mapNotNull null + } + if (studentNo.isBlank()) { + throw BadRequestException("В одной из строк отсутствует студенческий номер") + } + ParsedStudent( + studentNo = studentNo, + lastName = lastName, + firstName = cell("firstName"), + middleName = cell("middleName"), + basis = cell("basis"), + note = cell("note"), + ) + } + if (students.isEmpty()) { + throw BadRequestException("В таблице не найдено ни одного студента") + } + return ParsedGroup(groupNameFrom(filename, rows), students) + } + + private fun isStudentHeader(value: String): Boolean { + val normalized = value.lowercase().replace("\u00a0", " ").trim() + return normalized.startsWith("студен") || normalized.startsWith("студ.") || + normalized.startsWith("зачёт") || normalized.startsWith("зачет") + } + + private fun mapColumns(header: List): Map { + val result = mutableMapOf() + header.forEachIndexed { index, raw -> + val value = raw.lowercase().replace("\u00a0", " ").trim() + fun putIfAbsent(key: String, vararg prefixes: String) { + if (key !in result && prefixes.any { value.startsWith(it) }) { + result[key] = index + } + } + putIfAbsent("studentNo", "студенч", "студ.", "студбил", "зачёт", "зачет") + putIfAbsent("lastName", "фамили") + putIfAbsent("firstName", "имя") + putIfAbsent("middleName", "отчеств") + putIfAbsent("basis", "основ") + putIfAbsent("note", "примеч") + } + return result + } + + private fun normalizeNumber(value: String): String = + if (value.endsWith(".0")) value.dropLast(2) else value + + private fun groupNameFrom(filename: String, rows: List>): String { + val groupRegex = Regex("[А-ЯA-Z][А-ЯA-Za-z]*[- ]?\\d{1,4}[А-ЯA-Za-z]*") + for (row in rows.take(12)) { + for (cell in row) { + val value = cell.trim() + if (value.length in 2..30 && groupRegex.matches(value)) { + return value + } + } + } + return filename.substringBeforeLast('.').trim().ifBlank { "Группа" } + } +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/security/JwtConfig.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/security/JwtConfig.kt new file mode 100644 index 0000000..ae33bd3 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/security/JwtConfig.kt @@ -0,0 +1,37 @@ +package ru.ysu.lms.identity.security + +import com.nimbusds.jose.jwk.JWKSet +import com.nimbusds.jose.jwk.RSAKey +import com.nimbusds.jose.jwk.source.ImmutableJWKSet +import com.nimbusds.jose.proc.SecurityContext +import org.springframework.boot.context.properties.EnableConfigurationProperties +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder +import org.springframework.security.crypto.password.PasswordEncoder +import org.springframework.security.oauth2.jwt.JwtDecoder +import org.springframework.security.oauth2.jwt.JwtEncoder +import org.springframework.security.oauth2.jwt.NimbusJwtDecoder +import org.springframework.security.oauth2.jwt.NimbusJwtEncoder +import ru.ysu.lms.security.JwtProperties + +@Configuration +@EnableConfigurationProperties(JwtProperties::class) +class JwtConfig(private val keyStore: JwtKeyStore) { + + @Bean + fun rsaKey(): RSAKey = RSAKey.Builder(keyStore.publicKey) + .privateKey(keyStore.privateKey) + .keyID("lms") + .build() + + @Bean + fun jwtEncoder(rsaKey: RSAKey): JwtEncoder = + NimbusJwtEncoder(ImmutableJWKSet(JWKSet(rsaKey))) + + @Bean + fun jwtDecoder(): JwtDecoder = NimbusJwtDecoder.withPublicKey(keyStore.publicKey).build() + + @Bean + fun passwordEncoder(): PasswordEncoder = BCryptPasswordEncoder() +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/security/JwtKeyStore.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/security/JwtKeyStore.kt new file mode 100644 index 0000000..4ee75bf --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/security/JwtKeyStore.kt @@ -0,0 +1,50 @@ +package ru.ysu.lms.identity.security + +import jakarta.annotation.PostConstruct +import org.springframework.stereotype.Service +import ru.ysu.lms.identity.domain.Setting +import ru.ysu.lms.identity.repo.SettingRepository +import ru.ysu.lms.security.RsaKeys +import java.security.KeyPairGenerator +import java.security.interfaces.RSAPrivateKey +import java.security.interfaces.RSAPublicKey +import java.util.Base64 + +/** + * RSA signing keys for the identity service. Generated on first start and kept + * in the `settings` table, so no private key ever lives in the repository. + */ +@Service +class JwtKeyStore(private val settings: SettingRepository) { + + lateinit var privateKey: RSAPrivateKey + + lateinit var publicKey: RSAPublicKey + + @PostConstruct + fun init() { + val storedPrivate = settings.findById(PRIVATE_KEY).map { it.value }.orElse(null) + val storedPublic = settings.findById(PUBLIC_KEY).map { it.value }.orElse(null) + if (storedPrivate != null && storedPublic != null) { + privateKey = RsaKeys.privateKey(storedPrivate) + publicKey = RsaKeys.publicKey(storedPublic) + } else { + val generator = KeyPairGenerator.getInstance("RSA").apply { initialize(2048) } + val pair = generator.generateKeyPair() + privateKey = pair.private as RSAPrivateKey + publicKey = pair.public as RSAPublicKey + settings.save(Setting(PRIVATE_KEY, toPem("PRIVATE KEY", privateKey.encoded))) + settings.save(Setting(PUBLIC_KEY, toPem("PUBLIC KEY", publicKey.encoded))) + } + } + + private fun toPem(label: String, der: ByteArray): String { + val encoded = Base64.getMimeEncoder(64, "\n".toByteArray()).encodeToString(der) + return "-----BEGIN $label-----\n$encoded\n-----END $label-----\n" + } + + companion object { + const val PRIVATE_KEY = "jwt_private_key" + const val PUBLIC_KEY = "jwt_public_key" + } +} diff --git a/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/security/SecurityConfig.kt b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/security/SecurityConfig.kt new file mode 100644 index 0000000..05375b3 --- /dev/null +++ b/services/identity-service/src/main/kotlin/ru/ysu/lms/identity/security/SecurityConfig.kt @@ -0,0 +1,62 @@ +package ru.ysu.lms.identity.security + +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.core.convert.converter.Converter +import org.springframework.security.authentication.AbstractAuthenticationToken +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity +import org.springframework.security.config.annotation.web.builders.HttpSecurity +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity +import org.springframework.security.config.http.SessionCreationPolicy +import org.springframework.security.core.GrantedAuthority +import org.springframework.security.core.authority.SimpleGrantedAuthority +import org.springframework.security.oauth2.jwt.Jwt +import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter +import org.springframework.security.web.SecurityFilterChain + +@Configuration +@EnableWebSecurity +@EnableMethodSecurity +class SecurityConfig { + + @Bean + fun securityFilterChain(http: HttpSecurity): SecurityFilterChain { + http + .csrf { it.disable() } + .cors { it.disable() } + .sessionManagement { it.sessionCreationPolicy(SessionCreationPolicy.STATELESS) } + .authorizeHttpRequests { auth -> + auth.requestMatchers( + "/api/v1/auth/health", + "/api/v1/auth/setup", + "/api/v1/auth/login", + "/api/v1/auth/jwks.json", + "/actuator/**", + "/v3/api-docs/**", + "/swagger-ui/**", + "/swagger-ui.html", + ).permitAll() + auth.anyRequest().authenticated() + } + .oauth2ResourceServer { resource -> + resource.jwt { jwt -> jwt.jwtAuthenticationConverter(jwtAuthenticationConverter()) } + } + return http.build() + } + + private fun jwtAuthenticationConverter(): Converter { + val converter = JwtAuthenticationConverter() + converter.setJwtGrantedAuthoritiesConverter(roleAuthoritiesConverter()) + return converter + } + + private fun roleAuthoritiesConverter(): Converter> = + Converter { jwt -> + val role = jwt.getClaimAsString("role").orEmpty() + if (role.isBlank()) { + emptyList() + } else { + listOf(SimpleGrantedAuthority("ROLE_$role")) + } + } +} diff --git a/services/identity-service/src/main/resources/application.yml b/services/identity-service/src/main/resources/application.yml new file mode 100644 index 0000000..58a934b --- /dev/null +++ b/services/identity-service/src/main/resources/application.yml @@ -0,0 +1,37 @@ +server: + port: ${SERVER_PORT:8081} + +spring: + application: + name: identity-service + datasource: + url: ${LMS_DB_URL:jdbc:postgresql://localhost:5432/lms?currentSchema=identity} + username: ${LMS_DB_USER:lms} + password: ${LMS_DB_PASSWORD:lms} + jpa: + open-in-view: false + hibernate: + ddl-auto: validate + properties: + hibernate: + default_schema: identity + flyway: + enabled: true + locations: classpath:db/migration + schemas: identity + default-schema: identity + create-schemas: true + +management: + endpoints: + web: + exposure: + include: health,info + endpoint: + health: + probes: + enabled: true + +springdoc: + api-docs: + path: /v3/api-docs diff --git a/services/identity-service/src/main/resources/db/migration/V1__init.sql b/services/identity-service/src/main/resources/db/migration/V1__init.sql new file mode 100644 index 0000000..35654a8 --- /dev/null +++ b/services/identity-service/src/main/resources/db/migration/V1__init.sql @@ -0,0 +1,2 @@ +-- Baseline for the identity schema (accounts, students, groups, enrollments). +CREATE SCHEMA IF NOT EXISTS identity; diff --git a/services/identity-service/src/main/resources/db/migration/V2__accounts.sql b/services/identity-service/src/main/resources/db/migration/V2__accounts.sql new file mode 100644 index 0000000..1b107fc --- /dev/null +++ b/services/identity-service/src/main/resources/db/migration/V2__accounts.sql @@ -0,0 +1,45 @@ +-- Accounts, students, groups and enrollments for the identity service. + +CREATE TABLE accounts ( + id uuid PRIMARY KEY DEFAULT uuidv7(), + login varchar(64) NOT NULL UNIQUE, + password_hash varchar(255) NOT NULL, + role varchar(16) NOT NULL, + must_change_password boolean NOT NULL DEFAULT true, + temp_password varchar(64), + created_at timestamptz NOT NULL DEFAULT now(), + updated_at timestamptz NOT NULL DEFAULT now(), + CONSTRAINT accounts_role_check CHECK (role IN ('ADMIN', 'STUDENT')) +); + +CREATE TABLE students ( + account_id uuid PRIMARY KEY REFERENCES accounts (id) ON DELETE CASCADE, + student_no varchar(32) NOT NULL UNIQUE, + last_name varchar(100) NOT NULL DEFAULT '', + first_name varchar(100) NOT NULL DEFAULT '', + middle_name varchar(100) NOT NULL DEFAULT '', + basis varchar(100) NOT NULL DEFAULT '', + note text NOT NULL DEFAULT '' +); + +CREATE TABLE groups ( + id uuid PRIMARY KEY DEFAULT uuidv7(), + name varchar(100) NOT NULL UNIQUE, + task_duration_min integer NOT NULL DEFAULT 30, + created_at timestamptz NOT NULL DEFAULT now() +); + +CREATE TABLE enrollments ( + id uuid PRIMARY KEY DEFAULT uuidv7(), + group_id uuid NOT NULL REFERENCES groups (id) ON DELETE CASCADE, + student_id uuid NOT NULL REFERENCES students (account_id) ON DELETE CASCADE, + enrolled_at timestamptz NOT NULL DEFAULT now(), + CONSTRAINT enrollments_student_unique UNIQUE (student_id) +); + +CREATE INDEX enrollments_group_idx ON enrollments (group_id); + +CREATE TABLE settings ( + key varchar(100) PRIMARY KEY, + value text NOT NULL +); diff --git a/services/identity-service/src/test/kotlin/ru/ysu/lms/identity/IdentitySmokeTest.kt b/services/identity-service/src/test/kotlin/ru/ysu/lms/identity/IdentitySmokeTest.kt new file mode 100644 index 0000000..10d5288 --- /dev/null +++ b/services/identity-service/src/test/kotlin/ru/ysu/lms/identity/IdentitySmokeTest.kt @@ -0,0 +1,62 @@ +package ru.ysu.lms.identity + +import org.junit.jupiter.api.Test +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.boot.test.context.SpringBootTest +import org.springframework.test.context.DynamicPropertyRegistry +import org.springframework.test.context.DynamicPropertySource +import org.testcontainers.containers.PostgreSQLContainer +import org.testcontainers.junit.jupiter.Container +import org.testcontainers.junit.jupiter.Testcontainers +import ru.ysu.lms.identity.auth.AuthService +import ru.ysu.lms.common.UnauthorizedException + +@SpringBootTest +@Testcontainers +class IdentitySmokeTest { + + companion object { + @Container + val pg = PostgreSQLContainer("postgres:18").apply { + withDatabaseName("lms") + withUsername("lms") + withPassword("lms") + } + + @JvmStatic + @DynamicPropertySource + fun datasource(registry: DynamicPropertyRegistry) { + registry.add("spring.datasource.url") { pg.jdbcUrl } + registry.add("spring.datasource.username") { "lms" } + registry.add("spring.datasource.password") { "lms" } + } + } + + @Autowired + lateinit var authService: AuthService + + @Test + fun `context loads and admin not exists`() { + assert(!authService.adminExists()) { "admin should not exist" } + } + + @Test + fun `setup creates admin and login works`() { + val token = authService.setup( + ru.ysu.lms.identity.auth.SetupRequest("admin", "test12345", "test12345") + ) + assert(token.token.isNotBlank()) { "token should not be blank" } + assert(token.role == "ADMIN") + + val login = authService.login( + ru.ysu.lms.identity.auth.LoginRequest("admin", "test12345") + ) + assert(login.token.isNotBlank()) + + val ex = try { + authService.login(ru.ysu.lms.identity.auth.LoginRequest("admin", "bad")) + null + } catch (e: UnauthorizedException) { e } + assert(ex != null) { "bad password should throw" } + } +} \ No newline at end of file diff --git a/services/progress-service/build.gradle.kts b/services/progress-service/build.gradle.kts new file mode 100644 index 0000000..c9dfe1f --- /dev/null +++ b/services/progress-service/build.gradle.kts @@ -0,0 +1,26 @@ +plugins { + id("lms.spring-boot") +} + +dependencies { + implementation(platform(libs.springBootBom)) + + implementation(libs.springBootStarterWeb) + implementation(libs.springBootStarterValidation) + implementation(libs.springBootStarterActuator) + implementation(libs.springBootStarterDataJpa) + implementation(libs.springBootStarterSecurity) + implementation(libs.springBootStarterOauth2ResourceServer) + implementation(libs.springBootStarterFlyway) + implementation(libs.flywayPostgresql) + runtimeOnly(libs.postgresql) + implementation(libs.springdocStarterWebmvcUi) + implementation(project(":libs:common-http")) + implementation(project(":libs:security-jwt")) + + testImplementation(project(":libs:test-support")) +} + +springBoot { + mainClass.set("ru.ysu.lms.progress.ProgressServiceApplicationKt") +} \ No newline at end of file diff --git a/services/progress-service/src/main/kotlin/ru/ysu/lms/progress/ProgressServiceApplication.kt b/services/progress-service/src/main/kotlin/ru/ysu/lms/progress/ProgressServiceApplication.kt new file mode 100644 index 0000000..988618a --- /dev/null +++ b/services/progress-service/src/main/kotlin/ru/ysu/lms/progress/ProgressServiceApplication.kt @@ -0,0 +1,12 @@ +package ru.ysu.lms.progress + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication +import ru.ysu.lms.security.LmsSecurityAutoConfiguration + +@SpringBootApplication +class ProgressServiceApplication + +fun main(args: Array) { + runApplication(*args) +} \ No newline at end of file diff --git a/services/progress-service/src/main/kotlin/ru/ysu/lms/progress/domain/VariantAssignment.kt b/services/progress-service/src/main/kotlin/ru/ysu/lms/progress/domain/VariantAssignment.kt new file mode 100644 index 0000000..9e54c60 --- /dev/null +++ b/services/progress-service/src/main/kotlin/ru/ysu/lms/progress/domain/VariantAssignment.kt @@ -0,0 +1,33 @@ +package ru.ysu.lms.progress.domain + +import jakarta.persistence.Column +import jakarta.persistence.Entity +import jakarta.persistence.Id +import jakarta.persistence.Table +import ru.ysu.lms.common.Ids +import java.time.Instant +import java.util.UUID + +@Entity +@Table(name = "variant_assignments") +class VariantAssignment( + @Id var id: UUID = Ids.v7(), + @Column(nullable = false) var studentId: UUID = UUID(0,0), + @Column(nullable = false) var labId: UUID = UUID(0,0), + @Column(nullable = false) var variantId: UUID = UUID(0,0), + @Column(nullable = false) var manual: Boolean = false, + @Column(nullable = false) var assignedAt: Instant = Instant.now(), +) + +@Entity +@Table(name = "student_lab_levels") +class StudentLabLevel( + @Id + @Column(name = "student_id", insertable = false, updatable = false) + var studentId: UUID = UUID(0,0), + @Id + @Column(name = "lab_id", insertable = false, updatable = false) + var labId: UUID = UUID(0,0), + @Column(nullable = false) var labLevelId: UUID = UUID(0,0), + @Column(nullable = false) var manual: Boolean = false, +) \ No newline at end of file diff --git a/services/progress-service/src/main/kotlin/ru/ysu/lms/progress/security/SecurityConfig.kt b/services/progress-service/src/main/kotlin/ru/ysu/lms/progress/security/SecurityConfig.kt new file mode 100644 index 0000000..30dcfe3 --- /dev/null +++ b/services/progress-service/src/main/kotlin/ru/ysu/lms/progress/security/SecurityConfig.kt @@ -0,0 +1,38 @@ +package ru.ysu.lms.progress.security + +import org.springframework.context.annotation.Bean +import org.springframework.context.annotation.Configuration +import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity +import org.springframework.security.config.annotation.web.builders.HttpSecurity +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity +import org.springframework.security.config.http.SessionCreationPolicy +import org.springframework.security.oauth2.jwt.JwtDecoder +import org.springframework.security.oauth2.jwt.NimbusJwtDecoder +import org.springframework.security.web.SecurityFilterChain + +@Configuration +@EnableWebSecurity +@EnableMethodSecurity +class SecurityConfig { + + @Bean + fun jwtDecoder(): JwtDecoder = NimbusJwtDecoder.withJwkSetUri(JWK_URI).build() + + @Bean + fun securityFilterChain(http: HttpSecurity): SecurityFilterChain { + http + .csrf { it.disable() } + .cors { it.disable() } + .sessionManagement { it.sessionCreationPolicy(SessionCreationPolicy.STATELESS) } + .authorizeHttpRequests { auth -> + auth.requestMatchers("/actuator/**", "/v3/api-docs/**", "/swagger-ui/**").permitAll() + auth.anyRequest().authenticated() + } + .oauth2ResourceServer { it.jwt { } } + return http.build() + } + + companion object { + private val JWK_URI = System.getenv("LMS_JWT_JWK_SET_URI") ?: "http://localhost:8081/api/v1/auth/jwks.json" + } +} \ No newline at end of file diff --git a/services/progress-service/src/main/resources/application.yml b/services/progress-service/src/main/resources/application.yml new file mode 100644 index 0000000..c20ee68 --- /dev/null +++ b/services/progress-service/src/main/resources/application.yml @@ -0,0 +1,30 @@ +server: + port: ${SERVER_PORT:8083} +spring: + application: + name: progress-service + datasource: + url: ${LMS_DB_URL:jdbc:postgresql://localhost:5432/lms?currentSchema=progress} + username: ${LMS_DB_USER:lms} + password: ${LMS_DB_PASSWORD:lms} + jpa: + open-in-view: false + hibernate: + ddl-auto: validate + properties: + hibernate: + default_schema: progress + flyway: + enabled: true + locations: classpath:db/migration + schemas: progress + default-schema: progress + create-schemas: true +management: + endpoints: + web: + exposure: + include: health,info +springdoc: + api-docs: + path: /v3/api-docs \ No newline at end of file diff --git a/services/progress-service/src/main/resources/db/migration/V1__init.sql b/services/progress-service/src/main/resources/db/migration/V1__init.sql new file mode 100644 index 0000000..3de8726 --- /dev/null +++ b/services/progress-service/src/main/resources/db/migration/V1__init.sql @@ -0,0 +1,2 @@ +-- Baseline: student lab levels and variant assignments. +CREATE SCHEMA IF NOT EXISTS progress; \ No newline at end of file diff --git a/services/progress-service/src/main/resources/db/migration/V2__schema.sql b/services/progress-service/src/main/resources/db/migration/V2__schema.sql new file mode 100644 index 0000000..6bdfb53 --- /dev/null +++ b/services/progress-service/src/main/resources/db/migration/V2__schema.sql @@ -0,0 +1,22 @@ +-- Student levels per lab and variant assignments. + +CREATE TABLE student_lab_levels ( + student_id uuid NOT NULL, + lab_id uuid NOT NULL, + lab_level_id uuid NOT NULL, + manual boolean NOT NULL DEFAULT false, + updated_at timestamptz NOT NULL DEFAULT now(), + PRIMARY KEY (student_id, lab_id) +); + +CREATE TABLE variant_assignments ( + id uuid PRIMARY KEY DEFAULT uuidv7(), + student_id uuid NOT NULL, + lab_id uuid NOT NULL, + variant_id uuid NOT NULL, + manual boolean NOT NULL DEFAULT false, + assigned_at timestamptz NOT NULL DEFAULT now(), + CONSTRAINT va_student_lab_unique UNIQUE (student_id, lab_id) +); + +CREATE INDEX va_lab_idx ON variant_assignments (lab_id); \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..07040ed --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,31 @@ +// Entry point of the Gradle build: declares repositories and subprojects. +// Docs: https://docs.gradle.org/current/userguide/multi_project_builds.html + +dependencyResolutionManagement { + @Suppress("UnstableApiUsage") + repositories { + mavenCentral() + } +} + +plugins { + // Automatically provision the JDK declared by toolchains. + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" +} + +rootProject.name = "LMS" + +// Shared libraries (no Spring Boot application, plain JVM/Spring libraries). +include(":libs:common-http") +include(":libs:security-jwt") +include(":libs:markdown") +include(":libs:test-support") + +// Domain microservices. +include(":services:identity-service") +include(":services:academic-service") +include(":services:progress-service") +include(":services:gateway") + +// Server-side web UI (BFF): Thymeleaf + htmx. +include(":web") diff --git a/web/build.gradle.kts b/web/build.gradle.kts new file mode 100644 index 0000000..c69ecd3 --- /dev/null +++ b/web/build.gradle.kts @@ -0,0 +1,23 @@ +plugins { + id("lms.spring-boot") +} + +dependencies { + implementation(platform(libs.springBootBom)) + + implementation(libs.springBootStarterWeb) + implementation(libs.springBootStarterThymeleaf) + implementation(libs.springBootStarterValidation) + implementation(libs.springBootStarterActuator) + + implementation(project(":libs:common-http")) + + developmentOnly(platform(libs.springBootBom)) + developmentOnly(libs.springBootDevtools) + + testImplementation(project(":libs:test-support")) +} + +springBoot { + mainClass.set("ru.ysu.lms.web.WebApplicationKt") +} diff --git a/web/src/main/kotlin/ru/ysu/lms/web/WebApplication.kt b/web/src/main/kotlin/ru/ysu/lms/web/WebApplication.kt new file mode 100644 index 0000000..95838bc --- /dev/null +++ b/web/src/main/kotlin/ru/ysu/lms/web/WebApplication.kt @@ -0,0 +1,11 @@ +package ru.ysu.lms.web + +import org.springframework.boot.autoconfigure.SpringBootApplication +import org.springframework.boot.runApplication + +@SpringBootApplication +class WebApplication + +fun main(args: Array) { + runApplication(*args) +} diff --git a/web/src/main/kotlin/ru/ysu/lms/web/admin/AdminController.kt b/web/src/main/kotlin/ru/ysu/lms/web/admin/AdminController.kt new file mode 100644 index 0000000..b1541d1 --- /dev/null +++ b/web/src/main/kotlin/ru/ysu/lms/web/admin/AdminController.kt @@ -0,0 +1,124 @@ +package ru.ysu.lms.web.admin + +import jakarta.servlet.http.HttpSession +import org.springframework.http.HttpHeaders +import org.springframework.http.MediaType +import org.springframework.http.ResponseEntity +import org.springframework.stereotype.Controller +import org.springframework.ui.Model +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PathVariable +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestMapping +import org.springframework.web.bind.annotation.RequestParam +import org.springframework.web.multipart.MultipartFile +import org.springframework.web.servlet.mvc.support.RedirectAttributes +import ru.ysu.lms.web.api.ApiClient +import ru.ysu.lms.web.api.ApiException +import ru.ysu.lms.web.session.SessionKeys +import java.net.URLEncoder +import java.nio.charset.StandardCharsets + +@Controller +@RequestMapping("/admin") +class AdminController(private val api: ApiClient) { + + @GetMapping + fun dashboard(session: HttpSession, model: Model): String { + val groups = api.listGroups(token(session)) + model.addAttribute("groupCount", groups.size) + model.addAttribute("studentCount", groups.sumOf { it.studentCount }) + model.addAttribute("groups", groups.take(5)) + return "admin/dashboard" + } + + @GetMapping("/groups") + fun groups(session: HttpSession, model: Model): String { + model.addAttribute("groups", api.listGroups(token(session))) + return "admin/groups" + } + + @PostMapping("/groups") + fun createGroup( + @RequestParam name: String, + session: HttpSession, + redirect: RedirectAttributes, + ): String = try { + api.createGroup(token(session), name.trim()) + redirect.addFlashAttribute("notice", "Группа создана") + "redirect:/admin/groups" + } catch (ex: ApiException) { + redirect.addFlashAttribute("error", ex.message) + "redirect:/admin/groups" + } + + @PostMapping("/groups/import") + fun importGroup( + @RequestParam("file") file: MultipartFile, + @RequestParam(name = "name", required = false) name: String?, + session: HttpSession, + redirect: RedirectAttributes, + ): String { + if (file.isEmpty) { + redirect.addFlashAttribute("error", "Выберите файл со списком группы") + return "redirect:/admin/groups" + } + return try { + val result = api.importGroup( + token(session), + name, + file.originalFilename ?: "group.xlsx", + file.bytes, + ) + redirect.addFlashAttribute("importResult", result) + "redirect:/admin/groups/${result.groupId}" + } catch (ex: ApiException) { + redirect.addFlashAttribute("error", ex.message) + "redirect:/admin/groups" + } + } + + @GetMapping("/groups/{id}") + fun groupDetail( + @PathVariable id: String, + session: HttpSession, + model: Model, + ): String { + model.addAttribute("group", api.groupDetail(token(session), id)) + return "admin/group" + } + + @PostMapping("/groups/{id}/students/{studentId}/reset-password") + fun resetPassword( + @PathVariable id: String, + @PathVariable studentId: String, + session: HttpSession, + redirect: RedirectAttributes, + ): String = try { + val result = api.resetPassword(token(session), studentId) + redirect.addFlashAttribute("resetPassword", result.password) + redirect.addFlashAttribute("resetFor", studentId) + "redirect:/admin/groups/$id" + } catch (ex: ApiException) { + redirect.addFlashAttribute("error", ex.message) + "redirect:/admin/groups/$id" + } + + @GetMapping("/groups/{id}/credentials") + fun credentials( + @PathVariable id: String, + @RequestParam(defaultValue = "xlsx") format: String, + session: HttpSession, + ): ResponseEntity { + val download = api.credentials(token(session), id, format) + val encoded = URLEncoder.encode(download.filename, StandardCharsets.UTF_8).replace("+", "%20") + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename*=UTF-8''$encoded") + .contentType(MediaType.parseMediaType(download.contentType)) + .body(download.bytes) + } + + private fun token(session: HttpSession): String = + session.getAttribute(SessionKeys.TOKEN) as? String + ?: throw ApiException(401, "Сессия истекла, войдите заново") +} diff --git a/web/src/main/kotlin/ru/ysu/lms/web/api/ApiClient.kt b/web/src/main/kotlin/ru/ysu/lms/web/api/ApiClient.kt new file mode 100644 index 0000000..4a5d02c --- /dev/null +++ b/web/src/main/kotlin/ru/ysu/lms/web/api/ApiClient.kt @@ -0,0 +1,149 @@ +package ru.ysu.lms.web.api + +import org.springframework.beans.factory.annotation.Value +import org.springframework.core.ParameterizedTypeReference +import org.springframework.core.io.ByteArrayResource +import org.springframework.http.HttpHeaders +import org.springframework.http.MediaType +import org.springframework.stereotype.Component +import org.springframework.util.LinkedMultiValueMap +import org.springframework.web.client.RestClient +import org.springframework.web.client.RestClientException +import org.springframework.web.client.RestClientResponseException +import java.net.URLDecoder +import java.nio.charset.StandardCharsets + +@Component +class ApiClient( + @Value("\${lms.gateway.base-url}") baseUrl: String, +) { + private val client: RestClient = RestClient.builder().baseUrl(baseUrl).build() + + fun adminExists(): Boolean = + call { client.get().uri("/api/v1/auth/health").retrieve().body(HealthDto::class.java) }.adminExists + + fun setup(login: String, password: String, password2: String): AuthResponseDto = + call { + client.post().uri("/api/v1/auth/setup") + .contentType(MediaType.APPLICATION_JSON) + .body(SetupPayload(login, password, password2)) + .retrieve().body(AuthResponseDto::class.java) + } + + fun login(login: String, password: String): AuthResponseDto = + call { + client.post().uri("/api/v1/auth/login") + .contentType(MediaType.APPLICATION_JSON) + .body(LoginPayload(login, password)) + .retrieve().body(AuthResponseDto::class.java) + } + + fun changePassword(token: String, old: String, new: String, new2: String) { + call { + client.post().uri("/api/v1/auth/change-password") + .header(HttpHeaders.AUTHORIZATION, bearer(token)) + .contentType(MediaType.APPLICATION_JSON) + .body(ChangePasswordPayload(old, new, new2)) + .retrieve().toBodilessEntity() + } + } + + fun listGroups(token: String): List { + val type = object : ParameterizedTypeReference>() {} + return call { + client.get().uri("/api/v1/groups") + .header(HttpHeaders.AUTHORIZATION, bearer(token)) + .retrieve().body(type) + } ?: emptyList() + } + + fun createGroup(token: String, name: String): GroupDto = + call { + client.post().uri("/api/v1/groups") + .header(HttpHeaders.AUTHORIZATION, bearer(token)) + .contentType(MediaType.APPLICATION_JSON) + .body(CreateGroupPayload(name)) + .retrieve().body(GroupDto::class.java) + } + + fun importGroup( + token: String, + name: String?, + filename: String, + bytes: ByteArray, + ): ImportResultDto { + val parts = LinkedMultiValueMap() + parts.add( + "file", + object : ByteArrayResource(bytes) { + override fun getFilename(): String = filename + }, + ) + if (!name.isNullOrBlank()) { + parts.add("name", name) + } + return call { + client.post().uri("/api/v1/groups/import") + .header(HttpHeaders.AUTHORIZATION, bearer(token)) + .contentType(MediaType.MULTIPART_FORM_DATA) + .body(parts) + .retrieve().body(ImportResultDto::class.java) + } + } + + fun groupDetail(token: String, groupId: String): GroupDetailDto = + call { + client.get().uri("/api/v1/groups/{id}", groupId) + .header(HttpHeaders.AUTHORIZATION, bearer(token)) + .retrieve().body(GroupDetailDto::class.java) + } + + fun resetPassword(token: String, studentId: String): ResetPasswordDto = + call { + client.post().uri("/api/v1/students/{id}/reset-password", studentId) + .header(HttpHeaders.AUTHORIZATION, bearer(token)) + .retrieve().body(ResetPasswordDto::class.java) + } + + fun credentials(token: String, groupId: String, format: String): DownloadDto { + val entity = call { + client.get() + .uri { builder -> + builder.path("/api/v1/groups/{id}/credentials").queryParam("format", format).build(groupId) + } + .header(HttpHeaders.AUTHORIZATION, bearer(token)) + .retrieve().toEntity(ByteArray::class.java) + } + val disposition = entity.headers.getFirst(HttpHeaders.CONTENT_DISPOSITION).orEmpty() + val rawName = disposition.substringAfter("UTF-8''", "").substringBefore(';').ifBlank { "credentials.$format" } + val filename = URLDecoder.decode(rawName, StandardCharsets.UTF_8) + val contentType = entity.headers.contentType?.toString() ?: "application/octet-stream" + return DownloadDto(entity.body ?: ByteArray(0), filename, contentType) + } + + private fun bearer(token: String): String = "Bearer $token" + + private fun call(block: () -> T?): T = + try { + block() ?: throw ApiException(502, "Пустой ответ сервиса") + } catch (ex: ApiException) { + throw ex + } catch (ex: RestClientResponseException) { + throw ApiException(ex.statusCode.value(), detail(ex)) + } catch (ex: RestClientException) { + throw ApiException(502, "Сервис недоступен. Проверьте, что gateway запущен.") + } + + private fun detail(ex: RestClientResponseException): String { + val body = ex.responseBodyAsString + val match = DETAIL_PATTERN.find(body) + val parsed = match?.groupValues?.get(1) + ?.replace("\\\"", "\"") + ?.replace("\\n", "\n") + return parsed?.takeIf { it.isNotBlank() } ?: "Ошибка запроса (${ex.statusCode.value()})" + } + + private companion object { + val DETAIL_PATTERN = Regex("\"detail\"\\s*:\\s*\"((?:\\\\.|[^\"\\\\])*)\"") + } +} diff --git a/web/src/main/kotlin/ru/ysu/lms/web/api/ApiDtos.kt b/web/src/main/kotlin/ru/ysu/lms/web/api/ApiDtos.kt new file mode 100644 index 0000000..9945510 --- /dev/null +++ b/web/src/main/kotlin/ru/ysu/lms/web/api/ApiDtos.kt @@ -0,0 +1,78 @@ +package ru.ysu.lms.web.api + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties + +@JsonIgnoreProperties(ignoreUnknown = true) +data class HealthDto( + val ok: Boolean = false, + val adminExists: Boolean = false, +) + +@JsonIgnoreProperties(ignoreUnknown = true) +data class AuthResponseDto( + val token: String = "", + val id: String = "", + val login: String = "", + val role: String = "", + val name: String = "", + val mustChangePassword: Boolean = false, +) + +data class LoginPayload(val login: String, val password: String) + +data class SetupPayload(val login: String, val password: String, val password2: String) + +data class ChangePasswordPayload(val old: String, val new: String, val new2: String) + +@JsonIgnoreProperties(ignoreUnknown = true) +data class GroupDto( + val id: String = "", + val name: String = "", + val studentCount: Long = 0, + val taskDurationMin: Int = 30, +) + +data class CreateGroupPayload(val name: String) + +@JsonIgnoreProperties(ignoreUnknown = true) +data class CredentialDto( + val id: String = "", + val studentNo: String = "", + val fullName: String = "", + val password: String = "", +) + +@JsonIgnoreProperties(ignoreUnknown = true) +data class ImportResultDto( + val groupId: String = "", + val groupName: String = "", + val added: List = emptyList(), + val updated: List = emptyList(), +) + +@JsonIgnoreProperties(ignoreUnknown = true) +data class StudentRowDto( + val id: String = "", + val studentNo: String = "", + val fullName: String = "", + val basis: String = "", + val mustChangePassword: Boolean = false, + val tempPassword: String? = null, +) + +@JsonIgnoreProperties(ignoreUnknown = true) +data class GroupDetailDto( + val id: String = "", + val name: String = "", + val taskDurationMin: Int = 30, + val students: List = emptyList(), +) + +@JsonIgnoreProperties(ignoreUnknown = true) +data class ResetPasswordDto(val password: String = "") + +class DownloadDto( + val bytes: ByteArray, + val filename: String, + val contentType: String, +) diff --git a/web/src/main/kotlin/ru/ysu/lms/web/api/ApiException.kt b/web/src/main/kotlin/ru/ysu/lms/web/api/ApiException.kt new file mode 100644 index 0000000..0615f4b --- /dev/null +++ b/web/src/main/kotlin/ru/ysu/lms/web/api/ApiException.kt @@ -0,0 +1,6 @@ +package ru.ysu.lms.web.api + +class ApiException( + val status: Int, + override val message: String, +) : RuntimeException(message) diff --git a/web/src/main/kotlin/ru/ysu/lms/web/auth/AuthPageController.kt b/web/src/main/kotlin/ru/ysu/lms/web/auth/AuthPageController.kt new file mode 100644 index 0000000..f0e50c4 --- /dev/null +++ b/web/src/main/kotlin/ru/ysu/lms/web/auth/AuthPageController.kt @@ -0,0 +1,126 @@ +package ru.ysu.lms.web.auth + +import jakarta.servlet.http.HttpSession +import org.springframework.stereotype.Controller +import org.springframework.ui.Model +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.PostMapping +import org.springframework.web.bind.annotation.RequestParam +import ru.ysu.lms.web.api.ApiClient +import ru.ysu.lms.web.api.ApiException +import ru.ysu.lms.web.api.AuthResponseDto +import ru.ysu.lms.web.session.SessionKeys +import ru.ysu.lms.web.session.SessionUser + +@Controller +class AuthPageController(private val api: ApiClient) { + + @GetMapping("/") + fun root(session: HttpSession): String { + val user = currentUser(session) ?: return "redirect:/login" + return if (user.isAdmin) "redirect:/admin" else "redirect:/student" + } + + @GetMapping("/login") + fun loginPage(session: HttpSession, model: Model): String { + if (currentUser(session) != null) { + return "redirect:/" + } + model.addAttribute("adminExists", api.adminExists()) + return "login" + } + + @PostMapping("/login") + fun login( + @RequestParam login: String, + @RequestParam password: String, + session: HttpSession, + model: Model, + ): String = try { + val auth = api.login(login.trim(), password) + store(session, auth) + redirectFor(auth) + } catch (ex: ApiException) { + model.addAttribute("adminExists", api.adminExists()) + model.addAttribute("error", ex.message) + model.addAttribute("login", login) + "login" + } + + @GetMapping("/setup") + fun setupPage(model: Model): String { + if (api.adminExists()) { + return "redirect:/login" + } + return "setup" + } + + @PostMapping("/setup") + fun setup( + @RequestParam login: String, + @RequestParam password: String, + @RequestParam password2: String, + session: HttpSession, + model: Model, + ): String = try { + val auth = api.setup(login.trim(), password, password2) + store(session, auth) + "redirect:/admin" + } catch (ex: ApiException) { + model.addAttribute("error", ex.message) + model.addAttribute("login", login) + "setup" + } + + @GetMapping("/change-password") + fun changePasswordPage(): String = "change_password" + + @PostMapping("/change-password") + fun changePassword( + @RequestParam old: String, + @RequestParam("new") new: String, + @RequestParam new2: String, + session: HttpSession, + model: Model, + ): String { + val user = currentUser(session) ?: return "redirect:/login" + val token = session.getAttribute(SessionKeys.TOKEN) as? String ?: return "redirect:/login" + return try { + api.changePassword(token, old, new, new2) + session.setAttribute(SessionKeys.USER, user.copy(mustChangePassword = false)) + "redirect:/" + } catch (ex: ApiException) { + model.addAttribute("error", ex.message) + "change_password" + } + } + + @PostMapping("/logout") + fun logout(session: HttpSession): String { + session.invalidate() + return "redirect:/login" + } + + private fun currentUser(session: HttpSession): SessionUser? = + session.getAttribute(SessionKeys.USER) as? SessionUser + + private fun store(session: HttpSession, auth: AuthResponseDto) { + session.setAttribute(SessionKeys.TOKEN, auth.token) + session.setAttribute( + SessionKeys.USER, + SessionUser( + id = auth.id, + login = auth.login, + role = auth.role, + name = auth.name, + mustChangePassword = auth.mustChangePassword, + ), + ) + } + + private fun redirectFor(auth: AuthResponseDto): String = when { + auth.mustChangePassword -> "redirect:/change-password" + auth.role == "ADMIN" -> "redirect:/admin" + else -> "redirect:/student" + } +} diff --git a/web/src/main/kotlin/ru/ysu/lms/web/config/WebConfig.kt b/web/src/main/kotlin/ru/ysu/lms/web/config/WebConfig.kt new file mode 100644 index 0000000..8d946e7 --- /dev/null +++ b/web/src/main/kotlin/ru/ysu/lms/web/config/WebConfig.kt @@ -0,0 +1,34 @@ +package ru.ysu.lms.web.config + +import jakarta.servlet.http.HttpServletRequest +import org.springframework.context.annotation.Configuration +import org.springframework.web.bind.annotation.ControllerAdvice +import org.springframework.web.bind.annotation.ModelAttribute +import org.springframework.web.servlet.config.annotation.InterceptorRegistry +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer +import ru.ysu.lms.web.session.AdminInterceptor +import ru.ysu.lms.web.session.AuthInterceptor +import ru.ysu.lms.web.session.SessionKeys +import ru.ysu.lms.web.session.SessionUser + +@Configuration +class WebConfig( + private val authInterceptor: AuthInterceptor, + private val adminInterceptor: AdminInterceptor, +) : WebMvcConfigurer { + + override fun addInterceptors(registry: InterceptorRegistry) { + registry.addInterceptor(authInterceptor) + .addPathPatterns("/admin/**", "/student/**", "/change-password") + registry.addInterceptor(adminInterceptor) + .addPathPatterns("/admin/**") + } +} + +@ControllerAdvice +class GlobalModelAdvice { + + @ModelAttribute("currentUser") + fun currentUser(request: HttpServletRequest): SessionUser? = + request.getSession(false)?.getAttribute(SessionKeys.USER) as? SessionUser +} diff --git a/web/src/main/kotlin/ru/ysu/lms/web/config/WebErrorAdvice.kt b/web/src/main/kotlin/ru/ysu/lms/web/config/WebErrorAdvice.kt new file mode 100644 index 0000000..48bb7e6 --- /dev/null +++ b/web/src/main/kotlin/ru/ysu/lms/web/config/WebErrorAdvice.kt @@ -0,0 +1,19 @@ +package ru.ysu.lms.web.config + +import jakarta.servlet.http.HttpServletResponse +import org.springframework.ui.Model +import org.springframework.web.bind.annotation.ControllerAdvice +import org.springframework.web.bind.annotation.ExceptionHandler +import ru.ysu.lms.web.api.ApiException + +@ControllerAdvice +class WebErrorAdvice { + + @ExceptionHandler(ApiException::class) + fun handleApiError(ex: ApiException, response: HttpServletResponse, model: Model): String { + response.status = ex.status + model.addAttribute("status", ex.status) + model.addAttribute("message", ex.message) + return "error" + } +} diff --git a/web/src/main/kotlin/ru/ysu/lms/web/session/AdminInterceptor.kt b/web/src/main/kotlin/ru/ysu/lms/web/session/AdminInterceptor.kt new file mode 100644 index 0000000..107caf7 --- /dev/null +++ b/web/src/main/kotlin/ru/ysu/lms/web/session/AdminInterceptor.kt @@ -0,0 +1,23 @@ +package ru.ysu.lms.web.session + +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse +import org.springframework.stereotype.Component +import org.springframework.web.servlet.HandlerInterceptor + +@Component +class AdminInterceptor : HandlerInterceptor { + + override fun preHandle( + request: HttpServletRequest, + response: HttpServletResponse, + handler: Any, + ): Boolean { + val user = request.getSession(false)?.getAttribute(SessionKeys.USER) as? SessionUser + if (user != null && !user.isAdmin) { + response.sendRedirect("/student") + return false + } + return true + } +} diff --git a/web/src/main/kotlin/ru/ysu/lms/web/session/AuthInterceptor.kt b/web/src/main/kotlin/ru/ysu/lms/web/session/AuthInterceptor.kt new file mode 100644 index 0000000..78b1f1e --- /dev/null +++ b/web/src/main/kotlin/ru/ysu/lms/web/session/AuthInterceptor.kt @@ -0,0 +1,29 @@ +package ru.ysu.lms.web.session + +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse +import org.springframework.stereotype.Component +import org.springframework.web.servlet.HandlerInterceptor + +@Component +class AuthInterceptor : HandlerInterceptor { + + override fun preHandle( + request: HttpServletRequest, + response: HttpServletResponse, + handler: Any, + ): Boolean { + val session = request.getSession(false) + val user = session?.getAttribute(SessionKeys.USER) as? SessionUser + if (user == null) { + response.sendRedirect("/login") + return false + } + val uri = request.requestURI + if (user.mustChangePassword && !uri.startsWith("/change-password")) { + response.sendRedirect("/change-password") + return false + } + return true + } +} diff --git a/web/src/main/kotlin/ru/ysu/lms/web/session/SessionUser.kt b/web/src/main/kotlin/ru/ysu/lms/web/session/SessionUser.kt new file mode 100644 index 0000000..5fe91b0 --- /dev/null +++ b/web/src/main/kotlin/ru/ysu/lms/web/session/SessionUser.kt @@ -0,0 +1,17 @@ +package ru.ysu.lms.web.session + +data class SessionUser( + val id: String, + val login: String, + val role: String, + val name: String, + val mustChangePassword: Boolean, +) { + val isAdmin: Boolean get() = role == "ADMIN" + val isStudent: Boolean get() = role == "STUDENT" +} + +object SessionKeys { + const val TOKEN = "lms.token" + const val USER = "lms.user" +} diff --git a/web/src/main/kotlin/ru/ysu/lms/web/student/StudentController.kt b/web/src/main/kotlin/ru/ysu/lms/web/student/StudentController.kt new file mode 100644 index 0000000..15b0cda --- /dev/null +++ b/web/src/main/kotlin/ru/ysu/lms/web/student/StudentController.kt @@ -0,0 +1,13 @@ +package ru.ysu.lms.web.student + +import org.springframework.stereotype.Controller +import org.springframework.web.bind.annotation.GetMapping +import org.springframework.web.bind.annotation.RequestMapping + +@Controller +@RequestMapping("/student") +class StudentController { + + @GetMapping + fun dashboard(): String = "student/dashboard" +} diff --git a/web/src/main/resources/application.yml b/web/src/main/resources/application.yml new file mode 100644 index 0000000..c3a344d --- /dev/null +++ b/web/src/main/resources/application.yml @@ -0,0 +1,18 @@ +server: + port: ${SERVER_PORT:8090} + +spring: + application: + name: web + thymeleaf: + cache: false + +lms: + gateway: + base-url: ${LMS_GATEWAY_URL:http://localhost:8080} + +management: + endpoints: + web: + exposure: + include: health,info diff --git a/web/src/main/resources/static/css/app.css b/web/src/main/resources/static/css/app.css new file mode 100644 index 0000000..c5f496f --- /dev/null +++ b/web/src/main/resources/static/css/app.css @@ -0,0 +1,81 @@ +*, *::before, *::after { box-sizing: border-box; } + +html { height: 100%; } + +:root { + --c-bg: #f8fafc; + --c-surface: #ffffff; + --c-text: #0f172a; + --c-text-muted: #64748b; + --c-text-link: #6366f1; + --c-text-link-hover: #4f46e5; + --c-border: #e2e8f0; + --c-accent: #6366f1; + --c-badge-ok-bg: #dcfce7; + --c-badge-ok-text: #166534; + --c-badge-warn-bg: #fef3c7; + --c-badge-warn-text: #92400e; +} + +[data-theme="dark"] { + --c-bg: #0f1115; + --c-surface: #171a21; + --c-text: #e7e9ee; + --c-text-muted: #9aa3b2; + --c-text-link: #6ea8fe; + --c-text-link-hover: #8bb9fe; + --c-border: #262b36; + --c-accent: #6ea8fe; + --c-badge-ok-bg: rgba(16, 185, 129, 0.15); + --c-badge-ok-text: #6ee7b7; + --c-badge-warn-bg: rgba(251, 191, 36, 0.15); + --c-badge-warn-text: #fcd34d; +} + +body { + margin: 0; + background: var(--c-bg); + color: var(--c-text); + font-family: system-ui, -apple-system, "Segoe UI", Roboto, sans-serif; + line-height: 1.5; +} + +a { color: var(--c-text-link); } +a:hover { color: var(--c-text-link-hover); } + +.btn { + display: inline-flex; align-items: center; justify-content: center; gap: 0.5rem; + border-radius: 0.5rem; padding: 0.5rem 1rem; font-size: 0.875rem; font-weight: 500; + border: none; cursor: pointer; transition: opacity 0.15s; +} +.btn:active { opacity: 0.8; } +.btn-primary { background: var(--c-accent); color: white; } +.btn-primary:hover { opacity: 0.9; } +.btn-secondary { + background: var(--c-surface); color: var(--c-text); + box-shadow: inset 0 0 0 1px var(--c-border); +} +.btn-secondary:hover { background: var(--c-border); } + +.input { + width: 100%; border-radius: 0.5rem; background: var(--c-bg); color: var(--c-text); + padding: 0.5rem 0.75rem; font-size: 0.875rem; border: 1px solid var(--c-border); + outline: none; +} +.input:focus { border-color: var(--c-accent); box-shadow: 0 0 0 2px rgba(99, 102, 241, 0.2); } +.input::placeholder { color: var(--c-text-muted); } + +.label { display: block; margin-bottom: 0.25rem; font-size: 0.875rem; font-weight: 500; } + +.card { + border-radius: 0.75rem; background: var(--c-surface); border: 1px solid var(--c-border); +} + +.badge { display: inline-flex; align-items: center; border-radius: 9999px; padding: 0.125rem 0.625rem; font-size: 0.75rem; font-weight: 500; } +.badge-ok { background: var(--c-badge-ok-bg); color: var(--c-badge-ok-text); } +.badge-warn { background: var(--c-badge-warn-bg); color: var(--c-badge-warn-text); } + +table { width: 100%; font-size: 0.875rem; border-collapse: collapse; } +th { text-align: left; font-weight: 500; color: var(--c-text-muted); padding: 0.75rem 1.5rem; border-bottom: 1px solid var(--c-border); } +td { padding: 0.75rem 1.5rem; border-bottom: 1px solid var(--c-border); } +tr:last-child td { border-bottom: none; } \ No newline at end of file diff --git a/web/src/main/resources/static/js/htmx.min.js b/web/src/main/resources/static/js/htmx.min.js new file mode 100644 index 0000000..3b7ac1a --- /dev/null +++ b/web/src/main/resources/static/js/htmx.min.js @@ -0,0 +1 @@ +var htmx=function(){"use strict";const Q={onLoad:null,process:null,on:null,off:null,trigger:null,ajax:null,find:null,findAll:null,closest:null,values:function(e,t){const n=dn(e,t||"post");return n.values},remove:null,addClass:null,removeClass:null,toggleClass:null,takeClass:null,swap:null,defineExtension:null,removeExtension:null,logAll:null,logNone:null,logger:null,config:{historyEnabled:true,historyCacheSize:10,refreshOnHistoryMiss:false,defaultSwapStyle:"innerHTML",defaultSwapDelay:0,defaultSettleDelay:20,includeIndicatorStyles:true,indicatorClass:"htmx-indicator",requestClass:"htmx-request",addedClass:"htmx-added",settlingClass:"htmx-settling",swappingClass:"htmx-swapping",allowEval:true,allowScriptTags:true,inlineScriptNonce:"",inlineStyleNonce:"",attributesToSettle:["class","style","width","height"],withCredentials:false,timeout:0,wsReconnectDelay:"full-jitter",wsBinaryType:"blob",disableSelector:"[hx-disable], [data-hx-disable]",scrollBehavior:"instant",defaultFocusScroll:false,getCacheBusterParam:false,globalViewTransitions:false,methodsThatUseUrlParams:["get","delete"],selfRequestsOnly:true,ignoreTitle:false,scrollIntoViewOnBoost:true,triggerSpecsCache:null,disableInheritance:false,responseHandling:[{code:"204",swap:false},{code:"[23]..",swap:true},{code:"[45]..",swap:false,error:true}],allowNestedOobSwaps:true,historyRestoreAsHxRequest:true,reportValidityOfForms:false},parseInterval:null,location:location,_:null,version:"2.0.10"};Q.onLoad=j;Q.process=Ft;Q.on=ye;Q.off=xe;Q.trigger=ae;Q.ajax=Nn;Q.find=f;Q.findAll=y;Q.closest=g;Q.remove=z;Q.addClass=w;Q.removeClass=b;Q.toggleClass=G;Q.takeClass=W;Q.swap=_e;Q.defineExtension=_n;Q.removeExtension=zn;Q.logAll=$;Q.logNone=_;Q.parseInterval=d;Q._=e;const n={addTriggerHandler:St,bodyContains:se,canAccessLocalStorage:U,findThisElement:we,filterValues:yn,swap:_e,hasAttribute:s,getAttributeValue:a,getClosestAttributeValue:ne,getClosestMatch:A,getExpressionVars:Rn,getHeaders:mn,getInputValues:dn,getInternalData:oe,getSwapSpecification:bn,getTriggerSpecs:st,getTarget:Se,makeFragment:P,mergeObjects:le,makeSettleInfo:Sn,oobSwap:He,querySelectorExt:ce,settleImmediately:Yt,shouldCancel:ht,triggerEvent:ae,triggerErrorEvent:fe,withExtensions:Vt};const de=["get","post","put","delete","patch"];const R=de.map(function(e){return"[hx-"+e+"], [data-hx-"+e+"]"}).join(", ");function d(e){if(e==undefined){return undefined}let t=NaN;if(e.slice(-2)=="ms"){t=parseFloat(e.slice(0,-2))}else if(e.slice(-1)=="s"){t=parseFloat(e.slice(0,-1))*1e3}else if(e.slice(-1)=="m"){t=parseFloat(e.slice(0,-1))*1e3*60}else{t=parseFloat(e)}return isNaN(t)?undefined:t}function ee(e,t){return e instanceof Element&&e.getAttribute(t)}function s(e,t){return!!e.hasAttribute&&(e.hasAttribute(t)||e.hasAttribute("data-"+t))}function a(e,t){return ee(e,t)||ee(e,"data-"+t)}function c(e){const t=e.parentElement;if(!t&&e.parentNode instanceof ShadowRoot)return e.parentNode;return t}function te(){return document}function q(e,t){return e.getRootNode?e.getRootNode({composed:t}):te()}function A(e,t){while(e&&!t(e)){e=c(e)}return e||null}function o(e,t,n){const r=a(t,n);const o=a(t,"hx-disinherit");var i=a(t,"hx-inherit");if(e!==t){if(Q.config.disableInheritance){if(i&&(i==="*"||i.split(" ").indexOf(n)>=0)){return r}else{return null}}if(o&&(o==="*"||o.split(" ").indexOf(n)>=0)){return"unset"}}return r}function ne(t,n){let r=null;A(t,function(e){return!!(r=o(t,ue(e),n))});if(r!=="unset"){return r}}function h(e,t){return e instanceof Element&&e.matches(t)}function N(e){const t=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i;const n=t.exec(e);if(n){return n[1].toLowerCase()}else{return""}}function I(e){if("parseHTMLUnsafe"in Document){return Document.parseHTMLUnsafe(e)}const t=new DOMParser;return t.parseFromString(e,"text/html")}function L(e,t){while(t.childNodes.length>0){e.append(t.childNodes[0])}}function r(e){const t=te().createElement("script");ie(e.attributes,function(e){t.setAttribute(e.name,e.value)});t.textContent=e.textContent;t.async=false;if(Q.config.inlineScriptNonce){t.nonce=Q.config.inlineScriptNonce}return t}function i(e){return e.matches("script")&&(e.type==="text/javascript"||e.type==="module"||e.type==="")}function D(e){Array.from(e.querySelectorAll("script")).forEach(e=>{if(i(e)){const t=r(e);const n=e.parentNode;try{n.insertBefore(t,e)}catch(e){H(e)}finally{e.remove()}}})}function P(e){const t=e.replace(/]*)?>[\s\S]*?<\/head>/i,"");const n=N(t);let r;if(n==="html"){r=new DocumentFragment;const i=I(e);L(r,i.body);r.title=i.title}else if(n==="body"){r=new DocumentFragment;const i=I(t);L(r,i.body);r.title=i.title}else{const i=I('");r=i.querySelector("template").content;r.title=i.title;var o=r.querySelector("title");if(o&&o.parentNode===r){o.remove();r.title=o.innerText}}if(r){if(Q.config.allowScriptTags){D(r)}else{r.querySelectorAll("script").forEach(e=>e.remove())}}return r}function re(e){if(e){e()}}function t(e,t){return Object.prototype.toString.call(e)==="[object "+t+"]"}function k(e){return typeof e==="function"}function M(e){return t(e,"Object")}function oe(e){const t="htmx-internal-data";let n=e[t];if(!n){n=e[t]={}}return n}function F(t){const n=[];if(t){for(let e=0;e=0}function se(e){return e.getRootNode({composed:true})===document}function X(e){return e.trim().split(/\s+/)}function le(e,t){for(const n in t){if(t.hasOwnProperty(n)){e[n]=t[n]}}return e}function v(e){try{return JSON.parse(e)}catch(e){H(e);return null}}function U(){const e="htmx:sessionStorageTest";try{sessionStorage.setItem(e,e);sessionStorage.removeItem(e);return true}catch(e){return false}}function V(e){try{const t=new URL(e,window.location.href);e=t.pathname+t.search}catch(e){}if(e!="/"){e=e.replace(/\/+$/,"")}return e}function e(e){return On(te().body,function(){return eval(e)})}function j(t){const e=Q.on("htmx:load",function(e){t(e.detail.elt)});return e}function $(){Q.logger=function(e,t,n){if(console){console.log(t,e,n)}}}function _(){Q.logger=null}function f(e,t){if(typeof e!=="string"){return e.querySelector(t)}else{return f(te(),e)}}function y(e,t){if(typeof e!=="string"){return e.querySelectorAll(t)}else{return y(te(),e)}}function x(){return window}function z(e,t){e=S(e);if(t){x().setTimeout(function(){z(e);e=null},t)}else{c(e).removeChild(e)}}function ue(e){return e instanceof Element?e:null}function J(e){return e instanceof HTMLElement?e:null}function K(e){return typeof e==="string"?e:null}function p(e){return e instanceof Element||e instanceof Document||e instanceof DocumentFragment?e:null}function w(e,t,n){e=ue(S(e));if(!e){return}if(n){x().setTimeout(function(){w(e,t);e=null},n)}else{e.classList&&e.classList.add(t)}}function b(e,t,n){let r=ue(S(e));if(!r){return}if(n){x().setTimeout(function(){b(r,t);r=null},n)}else{if(r.classList){r.classList.remove(t);if(r.classList.length===0){r.removeAttribute("class")}}}}function G(e,t){e=S(e);e.classList.toggle(t)}function W(e,t){e=S(e);ie(e.parentElement.children,function(e){b(e,t)});w(ue(e),t)}function g(e,t){e=ue(S(e));if(e){return e.closest(t)}return null}function l(e,t){return e.substring(0,t.length)===t}function Z(e,t){return e.substring(e.length-t.length)===t}function Y(e){const t=e.trim();if(l(t,"<")&&Z(t,"/>")){return t.substring(1,t.length-2)}else{return t}}function m(t,r,n){if(r.indexOf("global ")===0){return m(t,r.slice(7),true)}t=S(t);const o=[];{let t=0;let n=0;for(let e=0;e"){t--}}if(n0){const r=Y(o.shift());let e;if(r.indexOf("closest ")===0){e=g(ue(t),Y(r.slice(8)))}else if(r.indexOf("find ")===0){e=f(p(t),Y(r.slice(5)))}else if(r==="next"||r==="nextElementSibling"){e=ue(t).nextElementSibling}else if(r.indexOf("next ")===0){e=pe(t,Y(r.slice(5)),!!n)}else if(r==="previous"||r==="previousElementSibling"){e=ue(t).previousElementSibling}else if(r.indexOf("previous ")===0){e=ge(t,Y(r.slice(9)),!!n)}else if(r==="document"){e=document}else if(r==="window"){e=window}else if(r==="body"){e=document.body}else if(r==="root"){e=q(t,!!n)}else if(r==="host"){e=t.getRootNode().host}else{s.push(r)}if(e){i.push(e)}}if(s.length>0){const e=s.join(",");const u=p(q(t,!!n));i.push(...F(u.querySelectorAll(e)))}return i}var pe=function(t,e,n){const r=p(q(t,n)).querySelectorAll(e);for(let e=0;e=0;e--){const o=r[e];if(o.compareDocumentPosition(t)===Node.DOCUMENT_POSITION_FOLLOWING){return o}}};function ce(e,t){if(typeof e!=="string"){return m(e,t)[0]}else{return m(te().body,e)[0]}}function S(e,t){if(typeof e==="string"){return f(p(t)||document,e)}else{return e}}function me(e,t,n,r){if(k(t)){return{target:te().body,event:K(e),listener:t,options:n}}else{return{target:S(e),event:K(t),listener:n,options:r}}}function ye(t,n,r,o){Gn(function(){const e=me(t,n,r,o);e.target.addEventListener(e.event,e.listener,e.options)});const e=k(n);return e?n:r}function xe(t,n,r){Gn(function(){const e=me(t,n,r);e.target.removeEventListener(e.event,e.listener)});return k(n)?n:r}const be=te().createElement("output");function ve(t,n){const e=ne(t,n);if(e){if(e==="this"){return[we(t,n)]}else{const r=m(t,e);const o=/(^|,)(\s*)inherit(\s*)($|,)/.test(e);if(o){const i=ue(A(t,function(e){return e!==t&&s(ue(e),n)}));if(i){r.push(...ve(i,n))}}if(r.length===0){H('The selector "'+e+'" on '+n+" returned no matches!");return[be]}else{return r}}}}function we(e,t){return ue(A(e,function(e){return a(ue(e),t)!=null}))}function Se(e){const t=ne(e,"hx-target");if(t){if(t==="this"){return we(e,"hx-target")}else{return ce(e,t)}}else{const n=oe(e);if(n.boosted){return te().body}else{return e}}}function Ee(e){return Q.config.attributesToSettle.includes(e)}function Ce(t,n){ie(Array.from(t.attributes),function(e){if(!n.hasAttribute(e.name)&&Ee(e.name)){t.removeAttribute(e.name)}});ie(n.attributes,function(e){if(Ee(e.name)){t.setAttribute(e.name,e.value)}})}function Oe(t,e){const n=Jn(e);for(let e=0;e0){s=e.substring(0,e.indexOf(":"));n=e.substring(e.indexOf(":")+1)}else{s=e}o.removeAttribute("hx-swap-oob");o.removeAttribute("data-hx-swap-oob");const r=m(t,n,false);if(r.length){ie(r,function(e){let t;const n=o.cloneNode(true);t=te().createDocumentFragment();t.appendChild(n);if(!Oe(s,e)){t=p(n)}const r={shouldSwap:true,target:e,fragment:t};if(!ae(e,"htmx:oobBeforeSwap",r))return;e=r.target;if(r.shouldSwap){Re(t);je(s,e,e,t,i);Te()}ie(i.elts,function(e){ae(e,"htmx:oobAfterSwap",r)})});o.parentNode.removeChild(o)}else{o.parentNode.removeChild(o);fe(te().body,"htmx:oobErrorNoTarget",{content:o,target:n})}return e}function Te(){const e=f("#--htmx-preserve-pantry--");if(e){for(const t of[...e.children]){const n=f("#"+t.id);n.parentNode.moveBefore(t,n);n.remove()}e.remove()}}function Re(e){ie(y(e,"[hx-preserve], [data-hx-preserve]"),function(e){const t=a(e,"id");const n=te().getElementById(t);if(n!=null){if(e.moveBefore){let e=f("#--htmx-preserve-pantry--");if(e==null){te().body.insertAdjacentHTML("afterend","
");e=f("#--htmx-preserve-pantry--")}e.moveBefore(n,null)}else{e.parentNode.replaceChild(n,e)}}})}function qe(i,e,s){ie(e.querySelectorAll("[id]"),function(t){const n=ee(t,"id");if(n&&n.length>0){const e=p(i);const r=e&&e.querySelector(CSS.escape(t.tagName)+"#"+CSS.escape(n));if(r&&r!==e){const o=t.cloneNode();Ce(t,r);s.tasks.push(function(){Ce(t,o)})}}})}function Ae(e){return function(){b(e,Q.config.addedClass);Ft(ue(e));Ne(p(e));ae(e,"htmx:load")}}function Ne(e){const t="[autofocus]";const n=J(h(e,t)?e:e.querySelector(t));if(n!=null){n.focus()}}function u(e,t,n,r){qe(e,n,r);while(n.childNodes.length>0){const o=n.firstChild;w(ue(o),Q.config.addedClass);e.insertBefore(o,t);if(o.nodeType!==Node.TEXT_NODE&&o.nodeType!==Node.COMMENT_NODE){r.tasks.push(Ae(o))}}}function Ie(e,t){let n=0;while(n0}function _e(h,d,p,g){if(!g){g={}}let m=null;let n=null;let e=function(){re(g.beforeSwapCallback);h=S(h);const r=g.contextElement?q(g.contextElement,false):te();const e=document.activeElement;let t={};t={elt:e,start:e?e.selectionStart:null,end:e?e.selectionEnd:null};const o=Sn(h);if(p.swapStyle==="textContent"){h.textContent=d}else{let n=P(d);o.title=g.title||n.title;if(g.historyRequest){n=n.querySelector("[hx-history-elt],[data-hx-history-elt]")||n}if(g.selectOOB){const i=g.selectOOB.split(",");for(let t=0;t0){x().setTimeout(n,p.settleDelay)}else{n()}};let t=Q.config.globalViewTransitions;if(p.hasOwnProperty("transition")){t=p.transition}const r=g.contextElement||te();if(t&&ae(r,"htmx:beforeTransition",g.eventInfo)&&typeof Promise!=="undefined"&&document.startViewTransition){const o=new Promise(function(e,t){m=e;n=t});const i=e;e=function(){document.startViewTransition(function(){i();return o})}}try{if(p?.swapDelay&&p.swapDelay>0){x().setTimeout(e,p.swapDelay)}else{e()}}catch(e){fe(r,"htmx:swapError",g.eventInfo);re(n);throw e}}function ze(e,t,n){const r=e.getResponseHeader(t);if(r.indexOf("{")===0){const o=v(r);for(const i in o){if(o.hasOwnProperty(i)){let e=o[i];if(M(e)){n=e.target!==undefined?e.target:n}else{e={value:e}}ae(n,i,e)}}}else{const s=r.split(",");for(let e=0;e0){const s=o[0];if(s==="]"){e--;if(e===0){if(n===null){t=t+"true"}o.shift();t+=")})";try{const l=On(r,function(){return Function(t)()},function(){return true});l.source=t;return l}catch(e){fe(te().body,"htmx:syntax:error",{error:e,source:t});return null}}}else if(s==="["){e++}if(tt(s,n,i)){t+="(("+i+"."+s+") ? ("+i+"."+s+") : (window."+s+"))"}else{t=t+s}n=o.shift()}}}function O(e,t){let n="";while(e.length>0&&!t.test(e[0])){n+=e.shift()}return n}function rt(e){let t;if(e.length>0&&Ye.test(e[0])){e.shift();t=O(e,Qe).trim();e.shift()}else{t=O(e,C)}return t}const ot="input, textarea, select";function it(e,t,n){const r=[];const o=et(t);do{O(o,Ze);const l=o.length;const u=O(o,/[,\[\s]/);if(u!==""){if(u==="every"){const c={trigger:"every"};O(o,Ze);c.pollInterval=d(O(o,/[,\[\s]/));O(o,Ze);var i=nt(e,o,"event");if(i){c.eventFilter=i}r.push(c)}else{const f={trigger:u};var i=nt(e,o,"event");if(i){f.eventFilter=i}O(o,Ze);while(o.length>0&&o[0]!==","){const a=o.shift();if(a==="changed"){f.changed=true}else if(a==="once"){f.once=true}else if(a==="consume"){f.consume=true}else if(a==="delay"&&o[0]===":"){o.shift();f.delay=d(O(o,C))}else if(a==="from"&&o[0]===":"){o.shift();if(Ye.test(o[0])){var s=rt(o)}else{var s=O(o,C);if(s==="closest"||s==="find"||s==="next"||s==="previous"){o.shift();const h=rt(o);if(h.length>0){s+=" "+h}}}f.from=s}else if(a==="target"&&o[0]===":"){o.shift();f.target=rt(o)}else if(a==="throttle"&&o[0]===":"){o.shift();f.throttle=d(O(o,C))}else if(a==="queue"&&o[0]===":"){o.shift();f.queue=O(o,C)}else if(a==="root"&&o[0]===":"){o.shift();f[a]=rt(o)}else if(a==="threshold"&&o[0]===":"){o.shift();f[a]=O(o,C)}else{fe(e,"htmx:syntax:error",{token:o.shift()})}O(o,Ze)}r.push(f)}}if(o.length===l){fe(e,"htmx:syntax:error",{token:o.shift()})}O(o,Ze)}while(o[0]===","&&o.shift());if(n){n[t]=r}return r}function st(e){const t=a(e,"hx-trigger");let n=[];if(t){const r=Q.config.triggerSpecsCache;n=r&&r[t]||it(e,t,r)}if(n.length>0){return n}else if(h(e,"form")){return[{trigger:"submit"}]}else if(h(e,'input[type="button"], input[type="submit"]')){return[{trigger:"click"}]}else if(h(e,ot)){return[{trigger:"change"}]}else{return[{trigger:"click"}]}}function lt(e){oe(e).cancelled=true}function ut(e,t,n){const r=oe(e);r.timeout=x().setTimeout(function(){if(se(e)&&r.cancelled!==true){if(!pt(n,e,Xt("hx:poll:trigger",{triggerSpec:n,target:e}))){t(e)}ut(e,t,n)}},n.pollInterval)}function ct(e){return location.hostname===e.hostname&&ee(e,"href")&&ee(e,"href").indexOf("#")!==0}function ft(e){return g(e,Q.config.disableSelector)}function at(t,n,e){if(t instanceof HTMLAnchorElement&&ct(t)&&(t.target===""||t.target==="_self")||t.tagName==="FORM"&&String(ee(t,"method")).toLowerCase()!=="dialog"){n.boosted=true;let r,o;if(t.tagName==="A"){r="get";o=ee(t,"href")}else{const i=ee(t,"method");r=i?i.toLowerCase():"get";o=ee(t,"action");if(o==null||o===""){o=location.href}if(r==="get"&&o.includes("?")){o=o.replace(/\?[^#]+/,"")}}e.forEach(function(e){gt(t,function(e,t){const n=ue(e);if(ft(n)){E(n);return}he(r,o,n,t)},n,e,true)})}}function ht(e,t){if(e.type==="submit"&&t.tagName==="FORM"){return true}else if(e.type==="click"){const n=t.closest('input[type="submit"], button');if(n&&n.form&&n.type==="submit"){return true}const r=t.closest("a");const o=/^#.+/;if(r&&r.href&&!o.test(r.getAttribute("href"))){return true}}return false}function dt(e,t){return oe(e).boosted&&e instanceof HTMLAnchorElement&&t.type==="click"&&(t.ctrlKey||t.metaKey)}function pt(e,t,n){const r=e.eventFilter;if(r){try{return r.call(t,n)!==true}catch(e){const o=r.source;fe(te().body,"htmx:eventFilter:error",{error:e,source:o});return true}}return false}function gt(l,u,e,c,f){const a=oe(l);let t;if(c.from){t=m(l,c.from)}else{t=[l]}if(c.changed){if(!("lastValue"in a)){a.lastValue=new WeakMap}t.forEach(function(e){if(!a.lastValue.has(c)){a.lastValue.set(c,new WeakMap)}a.lastValue.get(c).set(e,e.value)})}ie(t,function(i){const s=function(e){if(!se(l)){i.removeEventListener(c.trigger,s);return}if(dt(l,e)){return}if(f||ht(e,i)){e.preventDefault()}if(pt(c,l,e)){return}const t=oe(e);t.triggerSpec=c;if(t.handledFor==null){t.handledFor=[]}if(t.handledFor.indexOf(l)<0){t.handledFor.push(l);if(c.consume){e.stopPropagation()}if(c.target&&e.target){if(!h(ue(e.target),c.target)){return}}if(c.once){if(a.triggeredOnce){return}else{a.triggeredOnce=true}}if(c.changed){const n=e.target;const r=n.value;const o=a.lastValue.get(c);if(o.has(n)&&o.get(n)===r){return}o.set(n,r)}if(a.delayed){clearTimeout(a.delayed)}if(a.throttle){return}if(c.throttle>0){if(!a.throttle){ae(l,"htmx:trigger");u(l,e);a.throttle=x().setTimeout(function(){a.throttle=null},c.throttle)}}else if(c.delay>0){a.delayed=x().setTimeout(function(){ae(l,"htmx:trigger");u(l,e)},c.delay)}else{ae(l,"htmx:trigger");u(l,e)}}};if(e.listenerInfos==null){e.listenerInfos=[]}e.listenerInfos.push({trigger:c.trigger,listener:s,on:i});i.addEventListener(c.trigger,s)})}let mt=false;let yt=null;function xt(){if(!yt){yt=function(){mt=true};window.addEventListener("scroll",yt);window.addEventListener("resize",yt);setInterval(function(){if(mt){mt=false;ie(te().querySelectorAll("[hx-trigger*='revealed'],[data-hx-trigger*='revealed']"),function(e){bt(e)})}},200)}}function bt(e){if(!s(e,"data-hx-revealed")&&B(e)){e.setAttribute("data-hx-revealed","true");const t=oe(e);if(t.initHash){ae(e,"revealed")}else{e.addEventListener("htmx:afterProcessNode",function(){ae(e,"revealed")},{once:true})}}}function vt(e,t,n,r){const o=function(){if(!n.loaded){n.loaded=true;ae(e,"htmx:trigger");t(e)}};if(r>0){x().setTimeout(o,r)}else{o()}}function wt(t,n,e){let i=false;ie(de,function(r){if(s(t,"hx-"+r)){const o=a(t,"hx-"+r);i=true;n.path=o;n.verb=r;e.forEach(function(e){St(t,e,n,function(e,t){const n=ue(e);if(ft(n)){E(n);return}he(r,o,n,t)})})}});return i}function St(r,e,t,n){if(e.trigger==="revealed"){xt();gt(r,n,t,e);bt(ue(r))}else if(e.trigger==="intersect"){const o={};if(e.root){o.root=ce(r,e.root)}if(e.threshold){o.threshold=parseFloat(e.threshold)}const i=new IntersectionObserver(function(t){for(let e=0;e0){t.polling=true;ut(ue(r),n,e)}else{gt(r,n,t,e)}}function Et(e){const t=ue(e);if(!t){return false}const n=t.attributes;for(let e=0;e", "+e).join(""));return o}else{return[]}}function Rt(e){const t=At(e.target);const n=It(e);if(n){n.lastButtonClicked=t}}function qt(e){const t=It(e);if(t){t.lastButtonClicked=null}}function At(e){return g(ue(e),"button, input[type='submit']")}function Nt(e){return e.form||g(e,"form")}function It(e){const t=At(e.target);if(!t){return}const n=Nt(t);if(!n){return}return oe(n)}function Lt(e){e.addEventListener("click",Rt);e.addEventListener("focusin",Rt);e.addEventListener("focusout",qt)}function Dt(t,e,n){const r=oe(t);if(!Array.isArray(r.onHandlers)){r.onHandlers=[]}let o;const i=function(e){On(t,function(){if(ft(t)){return}if(!o){o=new Function("event",n)}o.call(t,e)})};t.addEventListener(e,i);r.onHandlers.push({event:e,listener:i})}function Pt(t){De(t);for(let e=0;eQ.config.historyCacheSize){i.shift()}while(i.length>0){try{sessionStorage.setItem("htmx-history-cache",JSON.stringify(i));break}catch(e){fe(te().body,"htmx:historyCacheError",{cause:e,cache:i});i.shift()}}}function Jt(t){if(!U()){return null}t=V(t);const n=v(sessionStorage.getItem("htmx-history-cache"))||[];for(let e=0;e=200&&this.status<400){r.response=this.response;ae(te().body,"htmx:historyCacheMissLoad",r);_e(r.historyElt,r.response,n,{contextElement:r.historyElt,historyRequest:true});$t(r.path);ae(te().body,"htmx:historyRestore",{path:e,cacheMiss:true,serverResponse:r.response})}else{fe(te().body,"htmx:historyCacheMissLoadError",r)}};if(ae(te().body,"htmx:historyCacheMiss",r)){t.send()}}function en(e){Gt();e=e||location.pathname+location.search;const t=Jt(e);if(t){const n={swapStyle:"innerHTML",swapDelay:0,settleDelay:0,scroll:t.scroll};const r={path:e,item:t,historyElt:_t(),swapSpec:n};if(ae(te().body,"htmx:historyCacheHit",r)){_e(r.historyElt,t.content,n,{contextElement:r.historyElt,title:t.title});$t(r.path);ae(te().body,"htmx:historyRestore",r)}}else{if(Q.config.refreshOnHistoryMiss){Q.location.reload(true)}else{Qt(e)}}}function tn(e){let t=ve(e,"hx-indicator");if(t==null){t=[e]}ie(t,function(e){const t=oe(e);t.requestCount=(t.requestCount||0)+1;w(e,Q.config.requestClass)});return t}function nn(e){let t=ve(e,"hx-disabled-elt");if(t==null){t=[]}ie(t,function(e){const t=oe(e);t.requestCount=(t.requestCount||0)+1;if(!e.hasAttribute("disabled")){e.setAttribute("disabled","");e.setAttribute("data-disabled-by-htmx","")}});return t}function rn(e,t){ie(e.concat(t),function(e){const t=oe(e);t.requestCount=(t.requestCount||1)-1});ie(e,function(e){const t=oe(e);if(t.requestCount===0){b(e,Q.config.requestClass)}});ie(t,function(e){const t=oe(e);if(t.requestCount===0&&e.hasAttribute("data-disabled-by-htmx")){e.removeAttribute("disabled");e.removeAttribute("data-disabled-by-htmx")}})}function on(t,n){for(let e=0;en.indexOf(e)<0)}else{e=e.filter(e=>e!==n)}r.delete(t);ie(e,e=>r.append(t,e))}}function cn(e){if(e instanceof HTMLSelectElement&&e.multiple){return F(e.querySelectorAll("option:checked")).map(function(e){return e.value})}if(e instanceof HTMLInputElement&&e.files){return F(e.files)}return e.value}function fn(t,n,r,e,o){if(e==null||on(t,e)){return}else{t.push(e)}if(sn(e)){const i=ee(e,"name");ln(i,cn(e),n);if(o){an(e,r)}}if(e instanceof HTMLFormElement){ie(e.elements,function(e){if(t.indexOf(e)>=0){un(e.name,cn(e),n)}else{t.push(e)}if(o){an(e,r)}});new FormData(e).forEach(function(e,t){if(e instanceof File&&e.name===""){return}ln(t,e,n)})}}function an(e,t){const n=e;if(n.willValidate){ae(n,"htmx:validation:validate");if(!n.checkValidity()){if(ae(n,"htmx:validation:failed",{message:n.validationMessage,validity:n.validity})&&!t.length&&Q.config.reportValidityOfForms){n.reportValidity()}t.push({elt:n,message:n.validationMessage,validity:n.validity})}}}function hn(n,e){for(const t of e.keys()){n.delete(t)}e.forEach(function(e,t){n.append(t,e)});return n}function dn(e,t){const n=[];const r=new FormData;const o=new FormData;const i=[];const s=oe(e);if(s.lastButtonClicked&&!se(s.lastButtonClicked)){s.lastButtonClicked=null}let l=e instanceof HTMLFormElement&&e.noValidate!==true||a(e,"hx-validate")==="true";if(s.lastButtonClicked){l=l&&s.lastButtonClicked.formNoValidate!==true}if(t!=="get"){fn(n,o,i,Nt(e),l)}fn(n,r,i,e,l);if(s.lastButtonClicked||e.tagName==="BUTTON"||e.tagName==="INPUT"&&ee(e,"type")==="submit"){const c=s.lastButtonClicked||e;const f=ee(c,"name");ln(f,c.value,o)}const u=ve(e,"hx-include");ie(u,function(e){fn(n,r,i,ue(e),l);if(!h(e,"form")){ie(p(e).querySelectorAll(ot),function(e){fn(n,r,i,e,l)})}});hn(r,o);return{errors:i,formData:r,values:kn(r)}}function pn(e,t,n){if(e!==""){e+="&"}if(String(n)==="[object Object]"){n=JSON.stringify(n)}const r=encodeURIComponent(n);e+=encodeURIComponent(t)+"="+r;return e}function gn(e){e=Dn(e);let n="";e.forEach(function(e,t){n=pn(n,t,e)});return n}function mn(e,t,n){const r={"HX-Request":"true","HX-Trigger":ee(e,"id"),"HX-Trigger-Name":ee(e,"name"),"HX-Target":a(t,"id"),"HX-Current-URL":location.href};Cn(e,"hx-headers",false,r);if(n!==undefined){r["HX-Prompt"]=n}if(oe(e).boosted){r["HX-Boosted"]="true"}return r}function yn(n,e){const t=ne(e,"hx-params");if(t){if(t==="none"){return new FormData}else if(t==="*"){return n}else if(t.indexOf("not ")===0){ie(t.slice(4).split(","),function(e){e=e.trim();n.delete(e)});return n}else{const r=new FormData;ie(t.split(","),function(t){t=t.trim();if(n.has(t)){n.getAll(t).forEach(function(e){r.append(t,e)})}});return r}}else{return n}}function xn(e){return!!ee(e,"href")&&ee(e,"href").indexOf("#")>=0}function bn(e,t){const n=t||ne(e,"hx-swap");const r={swapStyle:oe(e).boosted?"innerHTML":Q.config.defaultSwapStyle,swapDelay:Q.config.defaultSwapDelay,settleDelay:Q.config.defaultSettleDelay};if(Q.config.scrollIntoViewOnBoost&&oe(e).boosted&&!xn(e)){r.show="top"}if(n){const s=X(n);if(s.length>0){for(let e=0;e0?o.join(":"):null;r.scroll=c;r.scrollTarget=i}else if(l.indexOf("show:")===0){const f=l.slice(5);var o=f.split(":");const a=o.pop();var i=o.length>0?o.join(":"):null;r.show=a;r.showTarget=i}else if(l.indexOf("focus-scroll:")===0){const h=l.slice("focus-scroll:".length);r.focusScroll=h=="true"}else if(e==0){r.swapStyle=l}else{H("Unknown modifier in hx-swap: "+l)}}}}return r}function vn(e){return ne(e,"hx-encoding")==="multipart/form-data"||h(e,"form")&&ee(e,"enctype")==="multipart/form-data"}function wn(t,n,r){let o=null;Vt(n,function(e){if(o==null){o=e.encodeParameters(t,r,n)}});if(o!=null){return o}else{if(vn(n)){return hn(new FormData,Dn(r))}else{return gn(r)}}}function Sn(e){return{tasks:[],elts:[e]}}function En(e,t){const n=e[0];const r=e[e.length-1];if(t.scroll){var o=null;if(t.scrollTarget){o=ue(ce(n,t.scrollTarget))}if(t.scroll==="top"&&(n||o)){o=o||n;o.scrollTop=0}if(t.scroll==="bottom"&&(r||o)){o=o||r;o.scrollTop=o.scrollHeight}if(typeof t.scroll==="number"){x().setTimeout(function(){window.scrollTo(0,t.scroll)},0)}}if(t.show){var o=null;if(t.showTarget){let e=t.showTarget;if(t.showTarget==="window"){e="body"}o=ue(ce(n,e))}if(t.show==="top"&&(n||o)){o=o||n;o.scrollIntoView({block:"start",behavior:Q.config.scrollBehavior})}if(t.show==="bottom"&&(r||o)){o=o||r;o.scrollIntoView({block:"end",behavior:Q.config.scrollBehavior})}}}function Cn(r,e,o,i,s){if(i==null){i={}}if(r==null){return i}const l=a(r,e);if(l){let e=l.trim();let t=o;if(e==="unset"){return null}if(e.indexOf("javascript:")===0){e=e.slice(11);t=true}else if(e.indexOf("js:")===0){e=e.slice(3);t=true}if(e.indexOf("{")!==0){e="{"+e+"}"}let n;if(t){n=On(r,function(){if(s){return Function("event","return ("+e+")").call(r,s)}else{return Function("return ("+e+")").call(r)}},{})}else{n=v(e)}for(const u in n){if(n.hasOwnProperty(u)){if(i[u]==null){i[u]=n[u]}}}}return Cn(ue(c(r)),e,o,i,s)}function On(e,t,n){if(Q.config.allowEval){return t()}else{fe(e,"htmx:evalDisallowedError");return n}}function Hn(e,t,n){return Cn(e,"hx-vars",true,n,t)}function Tn(e,t,n){return Cn(e,"hx-vals",false,n,t)}function Rn(e,t){return le(Hn(e,t),Tn(e,t))}function qn(t,n,r){if(r!==null){try{t.setRequestHeader(n,r)}catch(e){t.setRequestHeader(n,encodeURIComponent(r));t.setRequestHeader(n+"-URI-AutoEncoded","true")}}}function An(t){if(t.responseURL){try{const e=new URL(t.responseURL);return e.pathname+e.search}catch(e){fe(te().body,"htmx:badResponseUrl",{url:t.responseURL})}}}function T(e,t){return t.test(e.getAllResponseHeaders())}function Nn(t,n,r){t=t.toLowerCase();if(r){if(r instanceof Element||typeof r==="string"){return he(t,n,null,null,{targetOverride:S(r)||be,returnPromise:true})}else{let e=S(r.target);if(r.target&&!e||r.source&&!e&&!S(r.source)){e=be}return he(t,n,S(r.source),r.event,{handler:r.handler,headers:r.headers,values:r.values,targetOverride:e,swapOverride:r.swap,select:r.select,returnPromise:true,push:r.push,replace:r.replace,selectOOB:r.selectOOB})}}else{return he(t,n,null,null,{returnPromise:true})}}function In(e){const t=[];while(e){t.push(e);e=e.parentElement}return t}function Ln(e,t,n){const r=new URL(t,location.protocol!=="about:"?location.href:window.origin);const o=location.protocol!=="about:"?location.origin:window.origin;const i=o===r.origin;if(Q.config.selfRequestsOnly){if(!i){return false}}return ae(e,"htmx:validateUrl",le({url:r,sameHost:i},n))}function Dn(e){if(e instanceof FormData)return e;const t=new FormData;for(const n in e){if(e.hasOwnProperty(n)){if(e[n]&&typeof e[n].forEach==="function"){e[n].forEach(function(e){t.append(n,e)})}else if(typeof e[n]==="object"&&!(e[n]instanceof Blob)){t.append(n,JSON.stringify(e[n]))}else{t.append(n,e[n])}}}return t}function Pn(r,o,e){return new Proxy(e,{get:function(t,e){if(typeof e==="number")return t[e];if(e==="length")return t.length;if(e==="push"){return function(e){t.push(e);r.append(o,e)}}if(typeof t[e]==="function"){return function(){t[e].apply(t,arguments);r.delete(o);t.forEach(function(e){r.append(o,e)})}}if(t[e]&&t[e].length===1){return t[e][0]}else{return t[e]}},set:function(e,t,n){e[t]=n;r.delete(o);e.forEach(function(e){r.append(o,e)});return true}})}function kn(o){return new Proxy(o,{get:function(e,t){if(typeof t==="symbol"){const r=Reflect.get(e,t);if(typeof r==="function"){return function(){return r.apply(o,arguments)}}else{return r}}if(t==="toJSON"){return()=>Object.fromEntries(o)}if(t in e){if(typeof e[t]==="function"){return function(){return o[t].apply(o,arguments)}}}const n=o.getAll(t);if(n.length===0){return undefined}else if(n.length===1){return n[0]}else{return Pn(e,t,n)}},set:function(t,n,e){if(typeof n!=="string"){return false}t.delete(n);if(e&&typeof e.forEach==="function"){e.forEach(function(e){t.append(n,e)})}else if(typeof e==="object"&&!(e instanceof Blob)){t.append(n,JSON.stringify(e))}else{t.append(n,e)}return true},deleteProperty:function(e,t){if(typeof t==="string"){e.delete(t)}return true},ownKeys:function(e){return Reflect.ownKeys(Object.fromEntries(e))},getOwnPropertyDescriptor:function(e,t){return Reflect.getOwnPropertyDescriptor(Object.fromEntries(e),t)}})}function he(t,n,r,o,i,k){let s=null;let l=null;i=i!=null?i:{};if(i.returnPromise&&typeof Promise!=="undefined"){var e=new Promise(function(e,t){s=e;l=t})}if(r==null){r=te().body}const M=i.handler||Vn;const F=i.select||null;if(!se(r)){re(s);return e}const u=i.targetOverride||ue(Se(r));if(u==null||u==be){fe(r,"htmx:targetError",{target:ne(r,"hx-target")});re(l);return e}let c=oe(r);const f=c.lastButtonClicked;if(f){const A=ee(f,"formaction");if(A!=null){n=A}const N=ee(f,"formmethod");if(N!=null){if(de.includes(N.toLowerCase())){t=N}else{re(s);return e}}}const a=ne(r,"hx-confirm");if(k===undefined){const K=function(e){return he(t,n,r,o,i,!!e)};const G={target:u,elt:r,path:n,verb:t,triggeringEvent:o,etc:i,issueRequest:K,question:a};if(ae(r,"htmx:confirm",G)===false){re(s);return e}}let h=r;let d=ne(r,"hx-sync");let p=null;let B=false;if(d){const I=d.split(":");const L=I[0].trim();if(L==="this"){h=we(r,"hx-sync")}else{h=ue(ce(r,L))}d=(I[1]||"drop").trim();c=oe(h);if(d==="drop"&&c.xhr&&c.abortable!==true){re(s);return e}else if(d==="abort"){if(c.xhr){re(s);return e}else{B=true}}else if(d==="replace"){ae(h,"htmx:abort")}else if(d.indexOf("queue")===0){const W=d.split(" ");p=(W[1]||"last").trim()}}if(c.xhr){if(c.abortable){ae(h,"htmx:abort")}else{if(p==null){if(o){const D=oe(o);if(D&&D.triggerSpec&&D.triggerSpec.queue){p=D.triggerSpec.queue}}if(p==null){p="last"}}if(c.queuedRequests==null){c.queuedRequests=[]}if(p==="first"&&c.queuedRequests.length===0){c.queuedRequests.push(function(){he(t,n,r,o,i)})}else if(p==="all"){c.queuedRequests.push(function(){he(t,n,r,o,i)})}else if(p==="last"){c.queuedRequests=[];c.queuedRequests.push(function(){he(t,n,r,o,i)})}re(s);return e}}const g=new XMLHttpRequest;c.xhr=g;c.abortable=B;const m=function(){c.xhr=null;c.abortable=false;if(c.queuedRequests!=null&&c.queuedRequests.length>0){const e=c.queuedRequests.shift();e()}};const X=ne(r,"hx-prompt");if(X){var y=prompt(X);if(y===null||!ae(r,"htmx:prompt",{prompt:y,target:u})){re(s);m();return e}}if(a&&!k){if(!confirm(a)){re(s);m();return e}}let x=mn(r,u,y);if(t!=="get"&&!vn(r)){x["Content-Type"]="application/x-www-form-urlencoded"}if(i.headers){x=le(x,i.headers)}const U=dn(r,t);let b=U.errors;const V=U.formData;if(i.values){hn(V,Dn(i.values))}const j=Dn(Rn(r,o));const v=hn(V,j);let w=yn(v,r);if(Q.config.getCacheBusterParam&&t==="get"){w.set("org.htmx.cache-buster",ee(u,"id")||"true")}if(n==null||n===""){n=location.href}const S=Cn(r,"hx-request");const $=oe(r).boosted;let E=Q.config.methodsThatUseUrlParams.indexOf(t)>=0;const C={boosted:$,useUrlParams:E,formData:w,parameters:kn(w),unfilteredFormData:v,unfilteredParameters:kn(v),headers:x,elt:r,target:u,verb:t,errors:b,withCredentials:i.credentials||S.credentials||Q.config.withCredentials,timeout:i.timeout||S.timeout||Q.config.timeout,path:n,triggeringEvent:o};if(!ae(r,"htmx:configRequest",C)){re(s);m();return e}n=C.path;t=C.verb;x=C.headers;w=Dn(C.parameters);b=C.errors;E=C.useUrlParams;if(b&&b.length>0){ae(r,"htmx:validation:halted",C);re(s);m();return e}const _=n.split("#");const z=_[0];const O=_[1];let H=n;if(E){H=z;const Z=!w.keys().next().done;if(Z){if(H.indexOf("?")<0){H+="?"}else{H+="&"}H+=gn(w);if(O){H+="#"+O}}}if(!Ln(r,H,C)){fe(r,"htmx:invalidPath",C);re(l);m();return e}g.open(t.toUpperCase(),H,true);g.overrideMimeType("text/html");g.withCredentials=C.withCredentials;g.timeout=C.timeout;if(S.noHeaders){}else{for(const P in x){if(x.hasOwnProperty(P)){const Y=x[P];qn(g,P,Y)}}}const T={xhr:g,target:u,requestConfig:C,etc:i,boosted:$,select:F,pathInfo:{requestPath:n,finalRequestPath:H,responsePath:null,anchor:O}};g.onload=function(){try{const t=In(r);T.pathInfo.responsePath=An(g);M(r,T);if(T.keepIndicators!==true){rn(R,q)}ae(r,"htmx:afterRequest",T);ae(r,"htmx:afterOnLoad",T);if(!se(r)){let e=null;while(t.length>0&&e==null){const n=t.shift();if(se(n)){e=n}}if(e){ae(e,"htmx:afterRequest",T);ae(e,"htmx:afterOnLoad",T)}}re(s)}catch(e){fe(r,"htmx:onLoadError",le({error:e},T));throw e}finally{m()}};g.onerror=function(){rn(R,q);fe(r,"htmx:afterRequest",T);fe(r,"htmx:sendError",T);re(l);m()};g.onabort=function(){rn(R,q);fe(r,"htmx:afterRequest",T);fe(r,"htmx:sendAbort",T);re(l);m()};g.ontimeout=function(){rn(R,q);fe(r,"htmx:afterRequest",T);fe(r,"htmx:timeout",T);re(l);m()};if(!ae(r,"htmx:beforeRequest",T)){re(s);m();return e}var R=tn(r);var q=nn(r);ie(["loadstart","loadend","progress","abort"],function(t){ie([g,g.upload],function(e){e.addEventListener(t,function(e){ae(r,"htmx:xhr:"+t,{lengthComputable:e.lengthComputable,loaded:e.loaded,total:e.total})})})});ae(r,"htmx:beforeSend",T);const J=E?null:wn(g,r,w);g.send(J);return e}function Mn(e,t){const n=t.xhr;let r=null;let o=null;if(T(n,/HX-Push:/i)){r=n.getResponseHeader("HX-Push");o="push"}else if(T(n,/HX-Push-Url:/i)){r=n.getResponseHeader("HX-Push-Url");o="push"}else if(T(n,/HX-Replace-Url:/i)){r=n.getResponseHeader("HX-Replace-Url");o="replace"}if(r){if(r==="false"){return{}}else{return{type:o,path:r}}}const i=t.pathInfo.finalRequestPath;const s=t.pathInfo.responsePath;let l=t.etc.push||ne(e,"hx-push-url");let u=t.etc.replace||ne(e,"hx-replace-url");if(l==="false")l=null;if(u==="false")u=null;const c=oe(e).boosted;let f=null;let a=null;if(l){f="push";a=l}else if(u){f="replace";a=u}else if(c){f="push";a=s||i}if(a){if(a==="true"){a=s||i}if(t.pathInfo.anchor&&a.indexOf("#")===-1){a=a+"#"+t.pathInfo.anchor}return{type:f,path:a}}else{return{}}}function Fn(e,t){var n=new RegExp(e.code);return n.test(t.toString(10))}function Bn(e){for(var t=0;t`+`.${t}{opacity:0;visibility: hidden} `+`.${n} .${t}, .${n}.${t}{opacity:1;visibility: visible;transition: opacity 200ms ease-in}`+"")}}function Zn(){const e=te().querySelector('meta[name="htmx-config"]');if(e){return v(e.content)}else{return null}}function Yn(){const e=Zn();if(e){Q.config=le(Q.config,e)}}Gn(function(){Yn();Wn();let e=te().body;Ft(e);const t=te().querySelectorAll("[hx-trigger='restored'],[data-hx-trigger='restored']");e.addEventListener("htmx:abort",function(e){const t=e.detail.elt||e.target;const n=oe(t);if(n&&n.xhr){n.xhr.abort()}});const n=window.onpopstate?window.onpopstate.bind(window):null;window.onpopstate=function(e){if(e.state&&e.state.htmx){en();ie(t,function(e){ae(e,"htmx:restored",{document:te(),triggerEvent:ae})})}else{if(n){n(e)}}};x().setTimeout(function(){ae(e,"htmx:load",{});e=null},0)});return Q}(); \ No newline at end of file diff --git a/web/src/main/resources/templates/admin/dashboard.html b/web/src/main/resources/templates/admin/dashboard.html new file mode 100644 index 0000000..3aebc9e --- /dev/null +++ b/web/src/main/resources/templates/admin/dashboard.html @@ -0,0 +1,48 @@ + + +Панель — LMS + +
+

Панель преподавателя

+ +
+
+

Группы

+

0

+
+
+

Студенты

+

0

+
+
+

Лабораторные

+

скоро

+
+
+ +
+
+

Группы

+ Все группы → +
+
+ + + + + + + + + + + + + +
НазваниеСтудентов
—0
Групп пока нет.
+
+
+
+ + \ No newline at end of file diff --git a/web/src/main/resources/templates/admin/group.html b/web/src/main/resources/templates/admin/group.html new file mode 100644 index 0000000..9f1430b --- /dev/null +++ b/web/src/main/resources/templates/admin/group.html @@ -0,0 +1,83 @@ + + +Группа + +
+ ← Все группы + +
+
+

Группа

+

+ Студентов: 0 +

+
+ +
+ +
+
+ +
+ Новый пароль: password +
+ +
+

+ Импорт: группа +

+

+ Новых студентов: 0, + обновлено: 0. +

+
+

Сохраните пароли — они показываются для выдачи студентам.

+ + + + + + + + + + + +
ФИОЛогинПароль
———
+
+
+ +
+ + + + + + + + + + + + + + + + + +
№ФИОЛогинОсноваПароль
1——— + временный + изменён + +
+ +
+
В группе пока нет студентов.
+
+
+ + \ No newline at end of file diff --git a/web/src/main/resources/templates/admin/groups.html b/web/src/main/resources/templates/admin/groups.html new file mode 100644 index 0000000..7b34f0d --- /dev/null +++ b/web/src/main/resources/templates/admin/groups.html @@ -0,0 +1,62 @@ + + +Группы — LMS + +
+

Группы

+ +
+
+ +
+
+

Создать группу

+
+ + +
+ +
+ +
+

Импорт студентов

+

+ Файл .xls, .xlsx или .csv со столбцами: студенческий номер, ФИО, основа обучения. +

+
+ + +
+
+ + +
+ +
+
+ +
+ + + + + + + + + + + + + + +
НазваниеСтудентовВыгрузка
—0 + XLSX + · + CSV +
Групп пока нет.
+
+
+ + \ No newline at end of file diff --git a/web/src/main/resources/templates/change_password.html b/web/src/main/resources/templates/change_password.html new file mode 100644 index 0000000..86d91f1 --- /dev/null +++ b/web/src/main/resources/templates/change_password.html @@ -0,0 +1,33 @@ + + +Смена пароля — LMS + +
+
+

Смена пароля

+

При первом входе пароль нужно сменить.

+ +
+ +
+
+ + +
+
+ + +

Минимум 8 символов.

+
+
+ + +
+ +
+
+
+ + \ No newline at end of file diff --git a/web/src/main/resources/templates/error.html b/web/src/main/resources/templates/error.html new file mode 100644 index 0000000..03d66d6 --- /dev/null +++ b/web/src/main/resources/templates/error.html @@ -0,0 +1,14 @@ + + +Ошибка — LMS + +
+
+

500

+

Что-то пошло не так

+ На главную +
+
+ + \ No newline at end of file diff --git a/web/src/main/resources/templates/fragments/base.html b/web/src/main/resources/templates/fragments/base.html new file mode 100644 index 0000000..4b8d3a3 --- /dev/null +++ b/web/src/main/resources/templates/fragments/base.html @@ -0,0 +1,44 @@ + + + + + + LMS + + + + + +
+
+ LMS + +
+
+
+ +
+
+ LMS v0.1.1 +
+ + diff --git a/web/src/main/resources/templates/index.html b/web/src/main/resources/templates/index.html new file mode 100644 index 0000000..786a817 --- /dev/null +++ b/web/src/main/resources/templates/index.html @@ -0,0 +1,20 @@ + + + + + + LMS + + + +
+

LMS

+

Система для проведения практических занятий. Каркас запущен.

+
    +
  • web-BFF: запущен
    • +
  • gateway: /actuator/health
    • +
  • identity / academic / progress: отдельные сервисы
    • +
+
+ + diff --git a/web/src/main/resources/templates/login.html b/web/src/main/resources/templates/login.html new file mode 100644 index 0000000..6435176 --- /dev/null +++ b/web/src/main/resources/templates/login.html @@ -0,0 +1,32 @@ + + +Вход — LMS + +
+
+

Вход

+ +
+ +
+ Аккаунт администратора ещё не создан. + Создать первый аккаунт +
+ +
+
+ + +
+
+ + +
+ +
+
+
+ + \ No newline at end of file diff --git a/web/src/main/resources/templates/setup.html b/web/src/main/resources/templates/setup.html new file mode 100644 index 0000000..74bc7a8 --- /dev/null +++ b/web/src/main/resources/templates/setup.html @@ -0,0 +1,35 @@ + + +Первый запуск — LMS + +
+
+

Создание администратора

+

+ Это разовая настройка. Аккаунт преподавателя создаётся один раз. +

+ +
+ +
+
+ + +
+
+ + +

Минимум 8 символов.

+
+
+ + +
+ +
+
+
+ + \ No newline at end of file diff --git a/web/src/main/resources/templates/student/dashboard.html b/web/src/main/resources/templates/student/dashboard.html new file mode 100644 index 0000000..48d3797 --- /dev/null +++ b/web/src/main/resources/templates/student/dashboard.html @@ -0,0 +1,25 @@ + + +Кабинет студента — LMS + +
+

+ Здравствуйте, студент +

+

+ Здесь появятся лабораторные работы, условия вашего варианта и материалы занятий. +

+ +
+

Разделы в разработке:

+
    +
  • список лабораторных и сроки сдачи;
    • +
  • условие закреплённого за вами варианта;
    • +
  • статьи и материалы занятий;
    • +
  • отправка решений.
    • +
+
+
+ + \ No newline at end of file