Premium(license, online) support added #125

scaik · 2023-11-27T23:19:46Z

Pull Request Etiquette

I have checked the PRs for upcoming features/bug fixes.

Changes

Internal code
API (affecting end-user code)
Other: New configuration fields added

Closes Issue: #39

Description

Added new command: /license <on/off>: Enables/disables online mode enforcing for the player himself. Adds player to PendingPremiumAccountBucket for specified in config time. Player is gonna have to reconnect to the server from premium account. If time runs out, player is gonna be able to connect from cracked account again.
On player handshake(PreLoginEvent), if player has premium(license) enabled or player consists in PendingPremiumAccountBucket, forces online mode for the connection. If player is in the bucket, on post login account is gonna be set to premium, now enforced online mode is enabled for the player.
New config field: enable-license-support and license-verify-time. First one enables /license command and online mode verification for premium players. Second field sets time for pending premium player to verify license account. Basically when player types /license passwd on, it kicks player and forces online mode for him. After license-verify-time runs out, player is gonna be able to relogin from cracked account again, premium wont be enabled for him.
Small other changes like changepass command argument name

…ster

[BugFix] Properly handle whitespaces in AuthenticationChatPasswordListener

scaik · 2023-11-27T23:20:38Z

Omg i just realized that it included commits from previous PR idk why, how do i get rid of them?

…ommand and premium account process(PreLoginEvent, ServerConnectedEvent)

[BugFix] When license support is disabled in config, block /license c…

bivashy · 2023-11-27T23:44:22Z

Omg i just realized that it included commits from previous PR idk why, how do i get rid of them?

You could create branch with "premium account" features and create new pull request.

But i dont think that (redundant commits) would have big impact

scaik · 2023-11-27T23:52:40Z

yeah, i accidentally pushed to main branch. next time i will create new branch)

scaik · 2023-11-28T21:30:15Z

@bivashy so what, is this alright, or i should add something else?

bivashy · 2023-11-28T21:33:31Z

@bivashy so what, is this alright, or i should add something else?

Hi, currently i don’t have time to review this Pull Request. But i haven't seen handle of the case when player changes his username.

You can look at LibreLogin, which handles every conflict, and name change

scaik · 2023-11-28T21:41:45Z

well, to handle name change properly you have to switch from username to uuid in the config anyway. i can check if player name have changed on prelogin and change account username to his new name.
anyway, gonna wait for your future review and tests

api/src/main/java/com/bivashy/auth/api/AuthPlugin.java

api/src/main/java/com/bivashy/auth/api/config/PluginConfig.java

core/src/main/java/me/mastercapexd/auth/config/message/context/misc/TimePlaceholderContext.java

bivashy · 2023-12-02T11:11:22Z

core/src/main/java/me/mastercapexd/auth/server/commands/ChangePasswordCommand.java

@@ -26,7 +27,7 @@ public class ChangePasswordCommand {

    @DefaultFor({"passchange", "changepass", "changepassword"})
    @CommandCooldown(CommandCooldown.DEFAULT_VALUE)
-    public void changePlayerPassword(ServerPlayer sender, DoublePassword password) {
+    public void changePlayerPassword(ServerPlayer sender, @Named("пароль") DoublePassword password) {


Maybe we could somehow make localized named annotation using Annotation replacers?

bivashy · 2023-12-02T11:11:52Z

core/src/main/java/me/mastercapexd/auth/server/commands/LicenseCommand.java

+    @DefaultFor({"license", "premium", "authlicense"})
+    @AutoComplete("* @onOff")
+    @CommandCooldown(CommandCooldown.DEFAULT_VALUE)
+    public void changePlayerPassword(ServerPlayer sender, @Named("пароль") String password, @Named("Вкл/Выкл") String onOff) {


Maybe we could somehow make localized named annotation using Annotation replacers?

bivashy · 2023-12-02T11:23:29Z

First of all, great job! You've tackled the feature I was hesitant to approach.

It seems you've implemented a mechanism that forces players into online mode if they have a pending premium account. Overall, the implementation is impressive.

However, there are a few aspects I'd like to modify or avoid. To address these, I plan to submit a Pull Request to your repository with the necessary changes. Please note, my review is intended as constructive feedback, not personal criticism. It's meant to make it easier for others to understand and work with the code.

Future Plans:
I'll keep this pull request open as there are specific issues I want to resolve.

Task List for Improvement:

Support Name Changes: Ensure name changes are supported, even if id-type in the configuration is set to NAME. This might require modifications in the AccountDatabase implementation.
Annotation Replacement: Substitute all @Named annotations with a custom annotation that can support localized messages.
Refactor Certain Getters: Refrain from using boolean isPremium in some getters; this may necessitate a refactor.

Good luck!

scaik · 2023-12-07T17:24:27Z

glad you are interested! im sorry, i didn't have time to do this before. i will look into it in 1-2 days i think

bivashy · 2023-12-19T16:47:33Z

Hello, maybe we should convert this Pull Request to Draft?
Because it is still WIP (Work in progress).

I can do it myself, you can just place thumbs up emoji on my comment, and I'll convert this Pull Request into Draft.

scaik · 2023-12-25T15:39:52Z

yeah, im sorry, i dont have much time right now. if this is gonna be still relevant, i can do this feature after the holidays

bivashy · 2023-12-25T15:45:29Z

No problem, there is no hurry, I'll try to contribute on this too when I'll have time.

Happy christmas!

scaik · 2023-12-25T19:21:13Z

you too!

scaik · 2024-03-08T19:57:39Z

hi, im back for now.
resolved your remarks about getters and jodatime, but i couldn't manage to replace @nAmed with annotation replacer, there are not enough docs for me about them to implement this feature.
and about player changing his username, i wouldn't allow him to login because that is not safe. most of the plugins handle players by their username, not uuid, so a player can imitate/replace his uuid and gain admin access.

bivashy · 2024-03-08T21:43:44Z

hi, im back for now. resolved your remarks about getters and jodatime, but i couldn't manage to replace @nAmed with annotation replacer, there are not enough docs for me about them to implement this feature. and about player changing his username, i wouldn't allow him to login because that is not safe. most of the plugins handle players by their username, not uuid, so a player can imitate/replace his uuid and gain admin access.

Hello there, annotation replacer documentation: https://github.com/Revxrsal/Lamp/wiki/Annotation-replacers

Also you are not right about nicknames and UUID, players cannot change their UUID, because:
If server runs as offline mode, player UUID is UUID.fromString("OfflinePlayer: " + name) in UTF-8:
https://github.com/PaperMC/Velocity/blob/8891faa52c85c165ce37540adc236f4678617b69/api/src/main/java/com/velocitypowered/api/util/UuidUtils.java#L52-L54

If server runs as online mode, player UUID is generated by Mojang: https://wiki.vg/Mojang_API#Username_to_UUID

scaik · 2024-03-09T09:40:45Z

oh, right.
but anyway, if player with license on changes his name to, for instance, admin's nickname. he will probably gain admin permissions

bivashy · 2024-03-11T16:49:24Z

oh, right. but anyway, if player with license on changes his name to, for instance, admin's nickname. he will probably gain admin permissions

Yes, but we can resolve that too, we could create "strategy" for profile conflict (when offline and online accounts has same name), you can see it here: https://github.com/kyngs/LibreLogin/wiki/Profile-Conflicts

And probably use code from this repository too

scaik · 2024-03-12T21:26:39Z

Alright, im going to be working on it. But i couldn't manage to make annotation replacers work, im sorry.

bivashy · 2024-03-12T22:07:40Z

Alright, im going to be working on it. But i couldn't manage to make annotation replacers work, im sorry.

No problem, its ok

scaik and others added 9 commits November 22, 2023 16:38

This commit implements feature to type password in chat to login/regi…

77ca4df

…ster

Reduced amount of arguments for Register/LoginCommandImpl constructor

71a54f5

Removed register/login-passwordchat-* fields from config.yml

265ffee

Added bungee support

c425e68

Properly format password in AuthenticationChatPasswordListener

5145944

Reverse equality logic

fee5d00

Merge pull request #1 from bivashy/scaik123/main

63c01a2

[BugFix] Properly handle whitespaces in AuthenticationChatPasswordListener

Merge branch 'bivashy:main' into main

e3872e5

Added /license command and premium support(hybrid authentication)

afc531a

scaik and others added 2 commits November 28, 2023 02:24

[BugFix] When license support is disabled in config, block /license c…

2ba2909

…ommand and premium account process(PreLoginEvent, ServerConnectedEvent)

Merge pull request #2 from scaik123/license-support-added

1450162

[BugFix] When license support is disabled in config, block /license c…

scaik added 2 commits November 28, 2023 14:56

Added premium authentication model(premium-authentication-steps)

4c4f9c2

Merge remote-tracking branch 'origin/main'

4738145

bivashy self-requested a review December 2, 2023 11:04

bivashy reviewed Dec 2, 2023

View reviewed changes

api/src/main/java/com/bivashy/auth/api/AuthPlugin.java Outdated Show resolved Hide resolved

bivashy reviewed Dec 2, 2023

View reviewed changes

api/src/main/java/com/bivashy/auth/api/config/PluginConfig.java Outdated Show resolved Hide resolved

bivashy reviewed Dec 2, 2023

View reviewed changes

core/src/main/java/me/mastercapexd/auth/config/message/context/misc/TimePlaceholderContext.java Outdated Show resolved Hide resolved

bivashy reviewed Dec 2, 2023

View reviewed changes

scaik marked this pull request as draft March 8, 2024 17:38

Fixed getters and added joda-time

a2e3660

scaik marked this pull request as ready for review March 8, 2024 19:53

bivashy marked this pull request as draft April 3, 2024 16:41

scaik closed this by deleting the head repository Jul 19, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Premium(license, online) support added #125

Premium(license, online) support added #125

scaik commented Nov 27, 2023 •

edited by bivashy

Loading

scaik commented Nov 27, 2023

bivashy commented Nov 27, 2023 •

edited

Loading

scaik commented Nov 27, 2023 •

edited

Loading

scaik commented Nov 28, 2023

bivashy commented Nov 28, 2023

scaik commented Nov 28, 2023

bivashy Dec 2, 2023

bivashy Dec 2, 2023

bivashy commented Dec 2, 2023

scaik commented Dec 7, 2023

bivashy commented Dec 19, 2023

scaik commented Dec 25, 2023

bivashy commented Dec 25, 2023

scaik commented Dec 25, 2023 •

edited

Loading

scaik commented Mar 8, 2024

bivashy commented Mar 8, 2024 •

edited

Loading

scaik commented Mar 9, 2024

bivashy commented Mar 11, 2024

scaik commented Mar 12, 2024

bivashy commented Mar 12, 2024

Premium(license, online) support added #125

Premium(license, online) support added #125

Conversation

scaik commented Nov 27, 2023 • edited by bivashy Loading

Pull Request Etiquette

Changes

Description

scaik commented Nov 27, 2023

bivashy commented Nov 27, 2023 • edited Loading

scaik commented Nov 27, 2023 • edited Loading

scaik commented Nov 28, 2023

bivashy commented Nov 28, 2023

scaik commented Nov 28, 2023

bivashy Dec 2, 2023

Choose a reason for hiding this comment

bivashy Dec 2, 2023

Choose a reason for hiding this comment

bivashy commented Dec 2, 2023

scaik commented Dec 7, 2023

bivashy commented Dec 19, 2023

scaik commented Dec 25, 2023

bivashy commented Dec 25, 2023

scaik commented Dec 25, 2023 • edited Loading

scaik commented Mar 8, 2024

bivashy commented Mar 8, 2024 • edited Loading

scaik commented Mar 9, 2024

bivashy commented Mar 11, 2024

scaik commented Mar 12, 2024

bivashy commented Mar 12, 2024

scaik commented Nov 27, 2023 •

edited by bivashy

Loading

bivashy commented Nov 27, 2023 •

edited

Loading

scaik commented Nov 27, 2023 •

edited

Loading

scaik commented Dec 25, 2023 •

edited

Loading

bivashy commented Mar 8, 2024 •

edited

Loading