commit 9b7748571e17846011bfbb9ce75713d1a6935033 Author: Vladislav Kopnin Date: Thu Sep 10 19:46:13 2026 +0300 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 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 0000000..249e583 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..f609d6a --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Sep 10 14:24:06 MSK 2026 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + 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