commit 52a732e62ab6c0a8c12544451c63953543dd57ff Author: RedGuy Date: Mon Jan 29 22:32:21 2024 +0300 Init diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b63da45 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/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/ + +### 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/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/discord.xml b/.idea/discord.xml new file mode 100644 index 0000000..d8e9561 --- /dev/null +++ b/.idea/discord.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..f9163b4 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..685720f --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..8197f64 --- /dev/null +++ b/README.md @@ -0,0 +1,30 @@ +# Тестовое задание Петров + +## Опишите алгоритм процесс "сделать чаю" +1. Взять чайник +2. Налить воды +3. Поставить чайник на базовую станцию +4. Включить чайник +5. Дождаться конца работы чайника +6. Взять кружку +7. Налить в кружку воды из чайника до нужного уровня +8. Взять пакетик чая +9. Положить пакетик чая в кружку и несколько раз поднять и опустить его +10. Взять ложку +11. Взять сахар используя ложку +12. Положить сахар в кружку +13. Взять сахар используя ложку +14. Положить сахар в кружку +15. Взять сахар используя ложку +16. Положить сахар в кружку +17. Перемешать чай ложкой +18. Готово + +## Напишите код программы получение АПИ котировок с биржи бинанс +(см. файл Task2.java) + +## Напишите смарт контракт для сделки двух участников в телеграм (выполняется когда заказчик и исполнитель подтвердили сделку и арбитраж если отказали) +(см. файл Task3.java) + +## Напишите на Java код позволяющий подписать ЭЦП документ +(см. файл Task4.java) \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..edf1954 --- /dev/null +++ b/build.gradle @@ -0,0 +1,24 @@ +plugins { + id 'java' +} + +group = 'ru.redguy.testtask' +version = '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} + +java { + compileJava.options.encoding = 'UTF-8' +} + +dependencies { + implementation("io.github.binance:binance-connector-java:3.2.0") + implementation("com.google.code.gson:gson:2.10.1") + implementation("org.telegram:telegrambots:6.9.7.0") +} + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7f93135 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..3fa8f86 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/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/HEAD/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 + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + 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 + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# 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..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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=. +@rem This is normally unused +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% equ 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% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/gradlew.bat.sig b/gradlew.bat.sig new file mode 100644 index 0000000..074e612 Binary files /dev/null and b/gradlew.bat.sig differ diff --git a/privateKey.pem b/privateKey.pem new file mode 100644 index 0000000..33b93ac Binary files /dev/null and b/privateKey.pem differ diff --git a/publicKey.pem b/publicKey.pem new file mode 100644 index 0000000..d24ab99 Binary files /dev/null and b/publicKey.pem differ diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..c081401 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'TestTask' + diff --git a/src/main/java/ru/redguy/testtask/Task2.java b/src/main/java/ru/redguy/testtask/Task2.java new file mode 100644 index 0000000..02fe31c --- /dev/null +++ b/src/main/java/ru/redguy/testtask/Task2.java @@ -0,0 +1,34 @@ +package ru.redguy.testtask; + +import com.binance.connector.client.SpotClient; +import com.binance.connector.client.impl.SpotClientImpl; +import com.google.gson.Gson; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Objects; +import java.util.Scanner; + +public class Task2 { + public static Gson gson = new Gson(); + + public static void main(String[] args) { + //Напишите код программы получение АПИ котировок с биржи бинанс + Scanner scanner = new Scanner(System.in); + System.out.print("Origin current (BNB): "); + String from = scanner.nextLine(); + System.out.print("Result current (BTC): "); + String to = scanner.nextLine(); + SpotClient client = new SpotClientImpl(); + Map params = new LinkedHashMap<>(); + params.put("symbol", from.trim() + to.trim()); + Price res = gson.fromJson(client.createMarket().averagePrice(params), Price.class); + System.out.println(res.price); + } + + class Price { + public int mins; + public String price; + public String closeTime; + } +} diff --git a/src/main/java/ru/redguy/testtask/Task3.java b/src/main/java/ru/redguy/testtask/Task3.java new file mode 100644 index 0000000..5f6093a --- /dev/null +++ b/src/main/java/ru/redguy/testtask/Task3.java @@ -0,0 +1,243 @@ +package ru.redguy.testtask; + +import org.telegram.telegrambots.bots.TelegramLongPollingBot; +import org.telegram.telegrambots.meta.TelegramBotsApi; +import org.telegram.telegrambots.meta.api.methods.send.SendMessage; +import org.telegram.telegrambots.meta.api.objects.Update; +import org.telegram.telegrambots.meta.exceptions.TelegramApiException; +import org.telegram.telegrambots.updatesreceivers.DefaultBotSession; + +import java.util.HashMap; + +import static ru.redguy.testtask.Task3.ContractState.*; + +public class Task3 { + public static void main(String[] args) throws TelegramApiException { + TelegramBotsApi telegramBotsApi = new TelegramBotsApi(DefaultBotSession.class); + telegramBotsApi.registerBot(new Bot(System.getenv("TOKEN"))); + } + + public static class TwoKeyMap extends HashMap { + //allow to get value by one of two keys + public void put(K key1, K key2, V value) { + super.put(key1, value); + super.put(key2, value); + } + } + + public static class Contract { + public ContractState state = WAITING_FOR_SECOND_USER; + public long initiatorUserId; + public long secondUserId; + + public Contract(long initiatorUserId, long secondUserId) { + this.initiatorUserId = initiatorUserId; + this.secondUserId = secondUserId; + } + } + + public enum ContractState { + WAITING_FOR_SECOND_USER, //ожидание подтверждения начала контракта от второго пользователя + WAITING_FOR_INITIATOR_ACTION, //ожидание действия от инициатора + WAITING_FOR_SECOND_USER_APPROVE, //ожидание подтверждения от второго пользователя + WAITING_FOR_SECOND_USER_ACTION, //ожидание действия от второго пользователя + WAITING_FOR_INITIATOR_APPROVE, //ожидание подтверждения от инициатора + DONE, //контракт завершен + CANCELED, //контракт отменен + WAITING_FOR_SECOND_USER_CANCEL, //ожидание отмены от второго пользователя + WAITING_FOR_INITIATOR_CANCEL_APPROVE //ожидание подтверждения отмены от инициатора + } + + public static class Bot extends TelegramLongPollingBot { + + TwoKeyMap contracts = new TwoKeyMap<>(); + + public Bot(String botToken) { + super(botToken); + } + + @Override + public void onUpdateReceived(Update update) { + if (update.hasMessage() && update.getMessage().hasText()) { + String text = update.getMessage().getText(); + String[] parts = text.split(" "); + switch (parts[0]) { + case "/start" -> { + reply(update, "Привет, для начала контракта отправь /contract (user id)"); + } + case "/contract" -> { + if (parts.length == 2) { + if (contracts.containsKey(update.getMessage().getFrom().getId())) { + reply(update, "У вас уже есть активный контракт"); + break; + } + if (contracts.containsKey(Long.parseLong(parts[1]))) { + reply(update, "У пользователя уже есть активный контракт"); + break; + } + contracts.put(update.getMessage().getFrom().getId(), Long.parseLong(parts[1]), new Contract(update.getMessage().getFrom().getId(), Long.parseLong(parts[1]))); + reply(update, "Ожидание подтверждения от пользователя, для отмены отправьте /cancel"); + sendMessage(Long.parseLong(parts[1]), "Пользователь " + update.getMessage().getFrom().getId() + " предлагает вам контракт, для подтверждения отправьте /accept, для отмены отправьте /cancel"); + } else { + reply(update, "Неверное количество аргументов"); + } + } + case "/accept" -> { + if (contracts.containsKey(update.getMessage().getFrom().getId())) { + Contract contract = contracts.get(update.getMessage().getFrom().getId()); + if(contract.secondUserId != update.getMessage().getFrom().getId()) { + reply(update, "Вы не являетесь вторым пользователем в контракте"); + break; + } + if (contract.state == ContractState.WAITING_FOR_SECOND_USER) { + contract.state = ContractState.WAITING_FOR_INITIATOR_ACTION; + reply(update, "Контракт подтвержден, ожидание действия от инициатора"); + sendMessage(contract.initiatorUserId, "Контракт подтвержден, выполните действия со своей стороны, когда закончите отправьте /done"); + } else { + reply(update, "Контракт уже подтвержден"); + } + } else { + reply(update, "У вас нет активного контракта"); + } + } + case "/done" -> { + if (contracts.containsKey(update.getMessage().getFrom().getId())) { + Contract contract = contracts.get(update.getMessage().getFrom().getId()); + if (contract.initiatorUserId != update.getMessage().getFrom().getId()) { + reply(update, "Вы не являетесь инициатором в контракте"); + break; + } + if (contract.state == ContractState.WAITING_FOR_INITIATOR_ACTION) { + contract.state = ContractState.WAITING_FOR_SECOND_USER_APPROVE; + reply(update, "Действие подтверждено, ожидание подтверждения от второго пользователя"); + sendMessage(contract.secondUserId, "Пользователь " + update.getMessage().getFrom().getId() + " выполнил действие, для подтверждения отправьте /approve"); + } else { + reply(update, "Действие уже подтверждено"); + } + } else { + reply(update, "У вас нет активного контракта"); + } + } + case "/approve" -> { + if (contracts.containsKey(update.getMessage().getFrom().getId())) { + Contract contract = contracts.get(update.getMessage().getFrom().getId()); + if (contract.secondUserId != update.getMessage().getFrom().getId()) { + reply(update, "Вы не являетесь вторым пользователем в контракте"); + break; + } + if (contract.state == ContractState.WAITING_FOR_SECOND_USER_APPROVE) { + contract.state = ContractState.WAITING_FOR_SECOND_USER_ACTION; + reply(update, "Действие подтверждено, ожидание ваших действий, когда закончите отправьте /ready"); + sendMessage(contract.initiatorUserId, "Пользователь " + update.getMessage().getFrom().getId() + " подтвердил действие, ожидание действий от второй стороны"); + } else { + reply(update, "Действие уже подтверждено"); + } + } else { + reply(update, "У вас нет активного контракта"); + } + } + case "/ready" -> { + if (contracts.containsKey(update.getMessage().getFrom().getId())) { + Contract contract = contracts.get(update.getMessage().getFrom().getId()); + if (contract.secondUserId != update.getMessage().getFrom().getId()) { + reply(update, "Вы не являетесь пользователем в контракте"); + break; + } + if (contract.state == ContractState.WAITING_FOR_SECOND_USER_ACTION) { + contract.state = ContractState.WAITING_FOR_INITIATOR_APPROVE; + reply(update, "Действие подтверждено, ожидание подтверждения от инициатора"); + sendMessage(contract.initiatorUserId, "Пользователь " + update.getMessage().getFrom().getId() + " выполнил действие, для подтверждения отправьте /approved"); + } else { + reply(update, "Действие уже подтверждено"); + } + } else { + reply(update, "У вас нет активного контракта"); + } + } + case "/approved" -> { + if (contracts.containsKey(update.getMessage().getFrom().getId())) { + Contract contract = contracts.get(update.getMessage().getFrom().getId()); + if (contract.initiatorUserId != update.getMessage().getFrom().getId()) { + reply(update, "Вы не являетесь инициатором в контракте"); + break; + } + if (contract.state == ContractState.WAITING_FOR_INITIATOR_APPROVE) { + contract.state = ContractState.DONE; + reply(update, "Действие подтверждено, контракт завершен"); + sendMessage(contract.secondUserId, "Инициатор " + update.getMessage().getFrom().getId() + " подтвердил действие, контракт завершен"); + contracts.remove(contract.initiatorUserId); + contracts.remove(contract.secondUserId); + } else { + reply(update, "Действие уже подтверждено"); + } + } else { + reply(update, "У вас нет активного контракта"); + } + } + case "/cancel" -> { + if (contracts.containsKey(update.getMessage().getFrom().getId())) { + Contract contract = contracts.get(update.getMessage().getFrom().getId()); + if (contract.state == WAITING_FOR_SECOND_USER || contract.state == WAITING_FOR_INITIATOR_ACTION) { + contract.state = ContractState.CANCELED; + reply(update, "Контракт отменен"); + sendMessage(contract.initiatorUserId, "Пользователь " + update.getMessage().getFrom().getId() + " отменил контракт"); + contracts.remove(contract.initiatorUserId); + contracts.remove(contract.secondUserId); + } else if(contract.state == CANCELED || contract.state == DONE) { + reply(update, "Контракт уже отменен"); + } else { + contract.state = ContractState.WAITING_FOR_SECOND_USER_CANCEL; + reply(update, "Контракт отменен, ожидание подтверждения от второго пользователя"); + sendMessage(contract.secondUserId, "Пользователь " + update.getMessage().getFrom().getId() + " отменил контракт, для подтверждения отправьте /cancel_approve"); + } + } else { + reply(update, "У вас нет активного контракта"); + } + } + case "/cancel_approve" -> { + if (contracts.containsKey(update.getMessage().getFrom().getId())) { + Contract contract = contracts.get(update.getMessage().getFrom().getId()); + if (contract.state == ContractState.WAITING_FOR_SECOND_USER_CANCEL) { + contract.state = ContractState.CANCELED; + reply(update, "Контракт отменен"); + sendMessage(contract.initiatorUserId, "Пользователь " + update.getMessage().getFrom().getId() + " отменил контракт"); + contracts.remove(contract.initiatorUserId); + contracts.remove(contract.secondUserId); + } else { + reply(update, "Контракт уже отменен"); + } + } else { + reply(update, "У вас нет активного контракта"); + } + } + } + } + } + + public void reply(Update update, String text) { + try { + execute(new SendMessage(update.getMessage().getChat().getId().toString(), text)); + } catch (TelegramApiException e) { + e.printStackTrace(); + } + } + + public void sendMessage(long userId, String text) { + try { + execute(new SendMessage(String.valueOf(userId), text)); + } catch (TelegramApiException e) { + e.printStackTrace(); + } + } + + @Override + public String getBotUsername() { + return "Somertestbot"; + } + + @Override + public String getBotToken() { + return super.getBotToken(); + } + } +} diff --git a/src/main/java/ru/redguy/testtask/Task4.java b/src/main/java/ru/redguy/testtask/Task4.java new file mode 100644 index 0000000..95ccb9a --- /dev/null +++ b/src/main/java/ru/redguy/testtask/Task4.java @@ -0,0 +1,50 @@ +package ru.redguy.testtask; + +import org.jetbrains.annotations.NotNull; + +import java.nio.file.Files; +import java.nio.file.Paths; +import java.security.*; + +public class Task4 { + public static void main(String[] args) throws Exception { + KeyPair keyPair = generateKeyPair(); + + saveKey(keyPair.getPrivate(), "privateKey.pem"); + saveKey(keyPair.getPublic(), "publicKey.pem"); + + byte[] data = Files.readAllBytes(Paths.get("gradlew.bat")); + + byte[] signature = sign(data, keyPair.getPrivate()); + + Files.write(Paths.get("gradlew.bat.sig"), signature); + + boolean isVerified = verify(data, signature, keyPair.getPublic()); + System.out.println("Signature verified: " + isVerified); + } + + public static KeyPair generateKeyPair() throws NoSuchAlgorithmException { + KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA"); + keyPairGenerator.initialize(2048); // Размер ключа 2048 бит + return keyPairGenerator.generateKeyPair(); + } + + public static void saveKey(@NotNull Key key, String fileName) throws Exception { + byte[] keyBytes = key.getEncoded(); + Files.write(Paths.get(fileName), keyBytes); + } + + public static byte[] sign(byte[] data, PrivateKey privateKey) throws Exception { + Signature signature = Signature.getInstance("SHA256withRSA"); + signature.initSign(privateKey); + signature.update(data); + return signature.sign(); + } + + public static boolean verify(byte[] data, byte[] signature, PublicKey publicKey) throws Exception { + Signature verifier = Signature.getInstance("SHA256withRSA"); + verifier.initVerify(publicKey); + verifier.update(data); + return verifier.verify(signature); + } +}