Hedgehog_server
/
ServerMonitorBot
3
0
Fork 0
Code Issues 14 Pull Requests Packages Projects 1 Releases Wiki Activity

Добавлена ролевая модель

feature/task-6-security
L_DelOff 2023-08-12 19:44:30 +03:00
parent e1ea86b36b
commit ad7ee9a96c
11 changed files with 226 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/ru/ldeloff/servermonitorbot/config/SshConfig.java
View File

@ -1,5 +1,8 @@
package ru.ldeloff.servermonitorbot.config;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import ru.ldeloff.servermonitorbot.model.SshServer;
@ -8,14 +11,8 @@ import java.util.List;
@Configuration
@ConfigurationProperties(prefix = "ssh")
@Getter
@Setter
public class SshConfig {
private List<SshServer> servers;
public List<SshServer> getServers() {
return servers;
}
public void setServers(List<SshServer> servers) {
this.servers = servers;
}
}

92
src/main/java/ru/ldeloff/servermonitorbot/controller/TelegramBotController.java
View File

@ -7,9 +7,13 @@ import org.telegram.telegrambots.bots.TelegramLongPollingBot;
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 ru.ldeloff.servermonitorbot.model.Role;
import ru.ldeloff.servermonitorbot.model.TelegramBot;
import ru.ldeloff.servermonitorbot.model.User;
import ru.ldeloff.servermonitorbot.repository.SshRepository;
import ru.ldeloff.servermonitorbot.service.TelegramBotService;
import ru.ldeloff.servermonitorbot.service.role.RoleService;
import ru.ldeloff.servermonitorbot.service.user.UserService;
import ru.ldeloff.servermonitorbot.utils.ui.TelegramBotKeyboard;
import ru.ldeloff.servermonitorbot.utils.ui.uname.UnameChatButtonAggregate;
@ -21,32 +25,67 @@ public class TelegramBotController extends TelegramLongPollingBot {
final TelegramBot telegramBot;
final SshRepository sshRepository;
final TelegramBotService telegramBotService;
final UserService userService;
final RoleService roleService;
@Override
public void onUpdateReceived(Update update) {
Role role = getRole(update);
if (update.hasMessage()) {
if (update.getMessage().hasText()) {
String messageText = update.getMessage().getText();
switch (messageText) {
case "/start" -> {
if (role.getId() < 3) {
log.info("Получена команда '" + messageText
+ "' от " + update.getMessage().getChat().getUserName());
+ "' от " + update.getMessage().getChat().getUserName()
+ " (" + update.getMessage().getChat().getId() + "). OK");
telegramBotService.firstUse(update, this);
} else {
log.warn("Получена команда '" + messageText
+ "' от " + update.getMessage().getChat().getUserName()
+ " (" + update.getMessage().getChat().getId() + "). Нет прав");
telegramBotService.notAuthorization(update, this);
}
}
case "Статус" -> {
if (role.getId() < 3) {
log.info("Получена команда '" + messageText
+ "' от " + update.getMessage().getChat().getUserName());
+ "' от " + update.getMessage().getChat().getUserName()
+ " (" + update.getMessage().getChat().getId() + "). OK");
telegramBotService.getStatusSessions(update, this);
} else {
log.warn("Получена команда '" + messageText
+ "' от " + update.getMessage().getChat().getUserName()
+ " (" + update.getMessage().getChat().getId() + "). Нет прав");
telegramBotService.notAuthorization(update, this);
}
}
case "uname" -> {
if (role.getId() < 3) {
log.info("Получена команда '" + messageText
+ "' от " + update.getMessage().getChat().getUserName());
+ "' от " + update.getMessage().getChat().getUserName()
+ " (" + update.getMessage().getChat().getId() + "). OK");
telegramBotService.sendUnameAggregate(update, this);
} else {
log.warn("Получена команда '" + messageText
+ "' от " + update.getMessage().getChat().getUserName()
+ " (" + update.getMessage().getChat().getId() + "). Нет прав");
telegramBotService.notAuthorization(update, this);
}
}
default -> {
if (role.getId() < 3) {
log.warn("Неизвестная команда '" + messageText
+ "' от " + update.getMessage().getChat().getUserName());
+ "' от " + update.getMessage().getChat().getUserName()
+ " (" + update.getMessage().getChat().getId() + "). ОК");
telegramBotService.switchToMainMenu(update, this);
} else {
log.warn("Неизвестная команда '" + messageText
+ "' от " + update.getMessage().getChat().getUserName()
+ " (" + update.getMessage().getChat().getId() + "). Нет прав");
telegramBotService.notAuthorization(update, this);
}
}
}
}
@ -56,20 +95,44 @@ public class TelegramBotController extends TelegramLongPollingBot {
if (tags.length > 1) {
switch (tags[0]) {
case "uname":
if (role.getId() < 3) {
log.info("Получена команда '" + messageText
+ "' от " + update.getCallbackQuery().getMessage().getChat().getUserName());
+ "' от " + update.getCallbackQuery().getMessage().getChat().getUserName()
+ " (" + update.getCallbackQuery().getMessage().getChat().getId() + "). ОК");
telegramBotService.uname(update, this);
} else {
log.info("Получена команда '" + messageText
+ "' от " + update.getCallbackQuery().getMessage().getChat().getUserName()
+ " (" + update.getCallbackQuery().getMessage().getChat().getId() + "). Нет прав");
telegramBotService.notAuthorization(update, this);
}
break;
default:
if (role.getId() < 3) {
log.warn("Неизвестная команда '" + messageText
+ "' от " + update.getCallbackQuery().getMessage().getChat().getUserName());
+ "' от " + update.getCallbackQuery().getMessage().getChat().getUserName()
+ " (" + update.getCallbackQuery().getMessage().getChat().getId() + "). ОК");
telegramBotService.switchToMainMenu(update, this);
} else {
log.warn("Неизвестная команда '" + messageText
+ "' от " + update.getCallbackQuery().getMessage().getChat().getUserName()
+ " (" + update.getCallbackQuery().getMessage().getChat().getId() + "). Нет прав");
telegramBotService.notAuthorization(update, this);
}
break;
}
} else {
if (role.getId() < 3) {
log.warn("Неверный формат команды '" + messageText
+ "' от " + update.getCallbackQuery().getMessage().getChat().getUserName());
+ "' от " + update.getCallbackQuery().getMessage().getChat().getUserName()
+ " (" + update.getCallbackQuery().getMessage().getChat().getId() + "). ОК");
telegramBotService.switchToMainMenu(update, this);
} else {
log.warn("Неверный формат команды '" + messageText
+ "' от " + update.getCallbackQuery().getMessage().getChat().getUserName()
+ " (" + update.getCallbackQuery().getMessage().getChat().getId() + "). Нет прав");
telegramBotService.notAuthorization(update, this);
}
}
}
}
@ -89,4 +152,19 @@ public class TelegramBotController extends TelegramLongPollingBot {
super.onClosing();
sshRepository.disconnectSessions();
}
private Role getRole(Update update) {
Long id = null;
if (update.hasMessage()) {
id = update.getMessage().getChat().getId();
} else if (update.hasCallbackQuery()) {
id = update.getCallbackQuery().getMessage().getChat().getId();
}
User user = userService.getByTelegramId(id);
if (user == null) {
return roleService.findRoleById(3L);
} else {
return user.getRole();
}
}
}

13
src/main/java/ru/ldeloff/servermonitorbot/repository/RoleRepository.java Normal file
View File

@ -0,0 +1,13 @@
package ru.ldeloff.servermonitorbot.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import ru.ldeloff.servermonitorbot.model.Role;
import java.util.Optional;
@Repository
public interface RoleRepository extends JpaRepository<Role, Long> {
Optional<Role> findRoleByName(String name);
Optional<Role> findRoleById(Long id);
}

10
src/main/java/ru/ldeloff/servermonitorbot/repository/UserRepository.java Normal file
View File

@ -0,0 +1,10 @@
package ru.ldeloff.servermonitorbot.repository;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.stereotype.Repository;
import ru.ldeloff.servermonitorbot.model.User;
@Repository
public interface UserRepository extends JpaRepository<User, Long> {
User getByTelegramId(long id);
}

3
src/main/java/ru/ldeloff/servermonitorbot/service/TelegramBotService.java
View File

@ -9,5 +9,6 @@ public interface TelegramBotService {
void getStatusSessions(Update update, TelegramBotController bot);
void sendUnameAggregate(Update update, TelegramBotController bot);
void uname(Update update, TelegramBotController bot);
void firstUse(Update update, TelegramBotController telegramBotController);
void firstUse(Update update, TelegramBotController bot);
void notAuthorization(Update update, TelegramBotController bot);
}

22
src/main/java/ru/ldeloff/servermonitorbot/service/TelegramBotServiceImpl.java
View File

@ -31,6 +31,28 @@ public class TelegramBotServiceImpl implements TelegramBotService {
message.setChatId(chatId);
sendMessage(telegramBotKeyboard.uiForm(message), bot);
}
@Override
public void notAuthorization(Update update, TelegramBotController bot) {
long id = 0L;
String login = null;
long chatId = 0L;
if (update.hasMessage()) {
id = update.getMessage().getChat().getId();
login = update.getMessage().getChat().getUserName();
chatId = update.getMessage().getChatId();
} else if (update.hasCallbackQuery()) {
id = update.getCallbackQuery().getMessage().getChat().getId();
login = update.getCallbackQuery().getMessage().getChat().getUserName();
chatId = update.getCallbackQuery().getMessage().getChatId();
}
SendMessage message = new SendMessage();
message.setText("У пользователя " + login
+ " (" + id + ") недостаточно прав для выполнения этой команды");
message.setChatId(chatId);
sendMessage(message, bot);
}
@Override
public void switchToMainMenu(Update update, TelegramBotController bot) {
SendMessage message = new SendMessage();

9
src/main/java/ru/ldeloff/servermonitorbot/service/role/RoleService.java Normal file
View File

@ -0,0 +1,9 @@
package ru.ldeloff.servermonitorbot.service.role;
import ru.ldeloff.servermonitorbot.model.Role;
public interface RoleService {
Role findRoleByName(String name);
Role findRoleById(Long id);
}

28
src/main/java/ru/ldeloff/servermonitorbot/service/role/RoleServiceImpl.java Normal file
View File

@ -0,0 +1,28 @@
package ru.ldeloff.servermonitorbot.service.role;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import ru.ldeloff.servermonitorbot.model.Role;
import ru.ldeloff.servermonitorbot.repository.RoleRepository;
import java.util.Locale;
import java.util.Optional;
@Service
@RequiredArgsConstructor
public class RoleServiceImpl implements RoleService {
private final RoleRepository roleRepository;
@Override
public Role findRoleByName(String name) {
Optional<Role> role = roleRepository.findRoleByName(name.toUpperCase(Locale.ROOT));
//noinspection OptionalGetWithoutIsPresent
return role.orElseGet(() -> roleRepository.findRoleByName("ANONYMOUS").get());
}
@Override
public Role findRoleById(Long id) {
Optional<Role> role = roleRepository.findRoleById(id);
return role.orElseGet(() -> roleRepository.findRoleByName("ANONYMOUS").get());
}
}

9
src/main/java/ru/ldeloff/servermonitorbot/service/user/UserService.java Normal file
View File

@ -0,0 +1,9 @@
package ru.ldeloff.servermonitorbot.service.user;
import ru.ldeloff.servermonitorbot.model.User;
public interface UserService {
User saveOrUpdateUser(User user);
User getByTelegramId(Long id);
}

29
src/main/java/ru/ldeloff/servermonitorbot/service/user/UserServiceImpl.java Normal file
View File

@ -0,0 +1,29 @@
package ru.ldeloff.servermonitorbot.service.user;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import ru.ldeloff.servermonitorbot.model.User;
import ru.ldeloff.servermonitorbot.repository.UserRepository;
@Service
@RequiredArgsConstructor
@Slf4j
public class UserServiceImpl implements UserService {
final UserRepository userRepository;
@Override
public User saveOrUpdateUser(User user) {
User existUser = userRepository.getByTelegramId(user.getTelegramId());
if (existUser != null) {
user.setId(existUser.getId());
}
return userRepository.save(user);
}
@Override
public User getByTelegramId(Long id) {
return userRepository.getByTelegramId(id);
}
}

4
src/main/java/ru/ldeloff/servermonitorbot/utils/ui/TelegramBotKeyboard.java
View File

@ -17,8 +17,8 @@ public class TelegramBotKeyboard implements UiFormer {
@Override
public SendMessage uiForm(SendMessage message) {
ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
replyKeyboardMarkup.setResizeKeyboard(true); //подгоняем размер
replyKeyboardMarkup.setOneTimeKeyboard(false); //скрываем после использования
replyKeyboardMarkup.setResizeKeyboard(true);
replyKeyboardMarkup.setOneTimeKeyboard(false);
ArrayList<KeyboardRow> keyboardRows = new ArrayList<>();