Skip to content

Commit

Permalink
[FEATURE] AuthCoreProvider rework
Browse files Browse the repository at this point in the history
  • Loading branch information
@gravit0
gravit0 committed Nov 5, 2021
1 parent fd75e8d commit dced154
Show file tree
Hide file tree
Showing 5 changed files with 136 additions and 160 deletions.
49 changes: 0 additions & 49 deletions ..._module/src/main/java/pro/gravit/launchermodules/fileauthsystem/FileAuthSystemModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,53 +46,4 @@ public Path getDatabasePath() {
return modulesConfigManager.getModuleConfigDir(moduleInfo.name);
}

public static class UserSessionEntity implements UserSession {
private final UUID uuid;
public transient FileSystemAuthCoreProvider.UserEntity entity;
public UUID userEntityUUID;
public String accessToken;
public String refreshToken;
public long expireMillis;

public UserSessionEntity(FileSystemAuthCoreProvider.UserEntity entity) {
this.uuid = UUID.randomUUID();
this.entity = entity;
this.accessToken = SecurityHelper.randomStringToken();
this.refreshToken = SecurityHelper.randomStringToken();
this.expireMillis = 0;
this.userEntityUUID = entity.uuid;
}

public void update(long expireMillis) {
this.expireMillis = System.currentTimeMillis() + expireMillis;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
UserSessionEntity entity = (UserSessionEntity) o;
return Objects.equals(uuid, entity.uuid);
}

@Override
public int hashCode() {
return Objects.hash(uuid);
}

@Override
public String getID() {
return uuid.toString();
}

@Override
public User getUser() {
return entity;
}

@Override
public long getExpireIn() {
return expireMillis;
}
}
}
126 changes: 91 additions & 35 deletions .../java/pro/gravit/launchermodules/fileauthsystem/providers/FileSystemAuthCoreProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class FileSystemAuthCoreProvider extends AuthCoreProvider implements Auth
public PasswordVerifier passwordVerifier;
private final transient Logger logger = LogManager.getLogger();
private transient Map<UUID, UserEntity> users = new ConcurrentHashMap<>();
private transient Set<FileAuthSystemModule.UserSessionEntity> sessions = ConcurrentHashMap.newKeySet();
private transient Set<UserSessionEntity> sessions = ConcurrentHashMap.newKeySet();
private transient FileAuthSystemModule module;
private transient Path dbPath;

Expand Down Expand Up @@ -133,7 +133,7 @@ public User getUserByUUID(UUID uuid) {

@Override
public UserSession getUserSessionByOAuthAccessToken(String accessToken) throws OAuthAccessTokenExpired {
FileAuthSystemModule.UserSessionEntity session = getSessionByAccessToken(accessToken);
UserSessionEntity session = getSessionByAccessToken(accessToken);
if (session == null) return null;
if (session.expireMillis != 0 && session.expireMillis < System.currentTimeMillis())
throw new OAuthAccessTokenExpired();
Expand All @@ -143,47 +143,42 @@ public UserSession getUserSessionByOAuthAccessToken(String accessToken) throws O
@Override
public AuthManager.AuthReport refreshAccessToken(String refreshToken, AuthResponse.AuthContext context) {
FileAuthSystemConfig config = module.jsonConfigurable.getConfig();
FileAuthSystemModule.UserSessionEntity session = getSessionByRefreshToken(refreshToken);
UserSessionEntity session = getSessionByRefreshToken(refreshToken);
if (session == null) return null;
session.refreshToken = SecurityHelper.randomStringToken();
session.accessToken = SecurityHelper.randomStringToken();
if (oauthTokenExpire != 0) {
session.update(oauthTokenExpire);
}
return AuthManager.AuthReport.ofOAuth(session.accessToken, session.refreshToken, oauthTokenExpire);
return AuthManager.AuthReport.ofOAuth(session.accessToken, session.refreshToken, oauthTokenExpire, session);
}

@Override
public void verifyAuth(AuthResponse.AuthContext context) throws AuthException {
// None
}

@Override
public PasswordVerifyReport verifyPassword(User user, AuthRequest.AuthPasswordInterface password) {
UserEntity entity = (UserEntity) user;
if (!(password instanceof AuthPlainPassword plainPassword)) {
return PasswordVerifyReport.FAILED;
public AuthManager.AuthReport authorize(String login, AuthResponse.AuthContext context, AuthRequest.AuthPasswordInterface password, boolean minecraftAccess) throws IOException {
UserEntity user = getUser(login);
if(user == null) {
throw AuthException.userNotFound();
}
if (passwordVerifier.check(entity.password, plainPassword.password)) {
return PasswordVerifyReport.OK;
if(context != null) {
AuthPlainPassword plainPassword = (AuthPlainPassword) password;
if(password == null) {
throw AuthException.wrongPassword();
}
if(!passwordVerifier.check(user.password, plainPassword.password)) {
throw AuthException.wrongPassword();
}
}
return PasswordVerifyReport.FAILED;
}

@Override
public AuthManager.AuthReport createOAuthSession(User user, AuthResponse.AuthContext context, PasswordVerifyReport report, boolean minecraftAccess) throws IOException {
FileAuthSystemConfig config = module.jsonConfigurable.getConfig();
FileAuthSystemModule.UserSessionEntity entity = new FileAuthSystemModule.UserSessionEntity((UserEntity) user);
addNewSession(entity);
UserSessionEntity session = new UserSessionEntity(user);
addNewSession(session);
if (oauthTokenExpire != 0) {
entity.update(oauthTokenExpire);
session.update(oauthTokenExpire);
}
if (minecraftAccess) {
String minecraftAccessToken = SecurityHelper.randomStringToken();
((UserEntity) user).accessToken = minecraftAccessToken;
return AuthManager.AuthReport.ofOAuthWithMinecraft(minecraftAccessToken, entity.accessToken, entity.refreshToken, oauthTokenExpire);
user.accessToken = minecraftAccessToken;
return AuthManager.AuthReport.ofOAuthWithMinecraft(minecraftAccessToken, session.accessToken, session.refreshToken, oauthTokenExpire, session);
}
return AuthManager.AuthReport.ofOAuth(entity.accessToken, entity.refreshToken, oauthTokenExpire);
return AuthManager.AuthReport.ofOAuth(session.accessToken, session.refreshToken, oauthTokenExpire, session);
}

@Override
Expand Down Expand Up @@ -236,7 +231,7 @@ public User registration(String login, String email, AuthRequest.AuthPasswordInt

@Override
public boolean deleteSession(UserSession session) {
return deleteSession((FileAuthSystemModule.UserSessionEntity) session);
return deleteSession((UserSessionEntity) session);
}

@Override
Expand Down Expand Up @@ -264,14 +259,14 @@ public void load(Path path) {
{
Path sessionsPath = path.resolve("Sessions.json");
if (!Files.exists(sessionsPath)) return;
Type sessionsType = new TypeToken<Set<FileAuthSystemModule.UserSessionEntity>>() {
Type sessionsType = new TypeToken<Set<UserSessionEntity>>() {
}.getType();
try (Reader reader = IOHelper.newReader(sessionsPath)) {
this.sessions = Launcher.gsonManager.configGson.fromJson(reader, sessionsType);
} catch (IOException e) {
LogHelper.error(e);
}
for (FileAuthSystemModule.UserSessionEntity sessionEntity : sessions) {
for (UserSessionEntity sessionEntity : sessions) {
if (sessionEntity.userEntityUUID != null) {
sessionEntity.entity = getUser(sessionEntity.userEntityUUID);
}
Expand All @@ -297,7 +292,7 @@ public void save(Path path) {
}
{
Path sessionsPath = path.resolve("Sessions.json");
Type sessionsType = new TypeToken<Set<FileAuthSystemModule.UserSessionEntity>>() {
Type sessionsType = new TypeToken<Set<UserSessionEntity>>() {
}.getType();
try (Writer writer = IOHelper.newWriter(sessionsPath)) {
Launcher.gsonManager.configGson.toJson(sessions, sessionsType, writer);
Expand All @@ -316,15 +311,15 @@ private UserEntity getUser(String username) {
return null;
}

private FileAuthSystemModule.UserSessionEntity getSessionByAccessToken(String accessToken) {
private UserSessionEntity getSessionByAccessToken(String accessToken) {
return sessions.stream().filter(e -> e.accessToken != null && e.accessToken.equals(accessToken)).findFirst().orElse(null);
}

private FileAuthSystemModule.UserSessionEntity getSessionByRefreshToken(String refreshToken) {
private UserSessionEntity getSessionByRefreshToken(String refreshToken) {
return sessions.stream().filter(e -> e.accessToken != null && e.refreshToken.equals(refreshToken)).findFirst().orElse(null);
}

private void addNewSession(FileAuthSystemModule.UserSessionEntity session) {
private void addNewSession(UserSessionEntity session) {
sessions.add(session);
}

Expand All @@ -351,7 +346,7 @@ private void deleteUser(UUID uuid) {
users.remove(uuid);
}

private boolean deleteSession(FileAuthSystemModule.UserSessionEntity entity) {
private boolean deleteSession(UserSessionEntity entity) {
return sessions.remove(entity);
}

Expand Down Expand Up @@ -422,4 +417,65 @@ public String toString() {
'}';
}
}

public static class UserSessionEntity implements UserSession {
private final UUID uuid;
public transient UserEntity entity;
public UUID userEntityUUID;
public String accessToken;
public String refreshToken;
public long expireMillis;

public UserSessionEntity(UserEntity entity) {
this.uuid = UUID.randomUUID();
this.entity = entity;
this.accessToken = SecurityHelper.randomStringToken();
this.refreshToken = SecurityHelper.randomStringToken();
this.expireMillis = 0;
this.userEntityUUID = entity.uuid;
}

public void update(long expireMillis) {
this.expireMillis = System.currentTimeMillis() + expireMillis;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
UserSessionEntity entity = (UserSessionEntity) o;
return Objects.equals(uuid, entity.uuid);
}

@Override
public int hashCode() {
return Objects.hash(uuid);
}

@Override
public String getID() {
return uuid.toString();
}

@Override
public User getUser() {
return entity;
}

@Override
public long getExpireIn() {
return expireMillis;
}

@Override
public String toString() {
return "UserSessionEntity{" +
"uuid=" + uuid +
", entity=" + entity +
", accessToken='" + accessToken + '\'' +
", refreshToken='" + refreshToken + '\'' +
", expireMillis=" + expireMillis +
'}';
}
}
}
40 changes: 15 additions & 25 deletions ...ule/src/main/java/pro/gravit/launchermodules/mojangsupport/MicrosoftAuthCoreProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,38 +96,28 @@ public AuthManager.AuthReport refreshAccessToken(String refreshToken, AuthRespon
}*/

@Override
public PasswordVerifyReport verifyPassword(User user, AuthRequest.AuthPasswordInterface password) {
return new MicrosoftPasswordVerifyReport(((AuthCodePassword)password).code);
}

private static class MicrosoftPasswordVerifyReport extends PasswordVerifyReport {
private final String microsoftCode;

public MicrosoftPasswordVerifyReport(String code) {
super(true);
this.microsoftCode = code;
public AuthManager.AuthReport authorize(String login, AuthResponse.AuthContext context, AuthRequest.AuthPasswordInterface password, boolean minecraftAccess) throws IOException {
if(login == null) {
throw AuthException.userNotFound();
}
}

@Override
public AuthManager.AuthReport createOAuthSession(User user, AuthResponse.AuthContext context, PasswordVerifyReport report, boolean minecraftAccess) throws IOException {
if(report == null) {
throw new AuthException("Microsoft authorization not be ignored");
if(password == null) {
throw AuthException.wrongPassword();
}
var code = ((MicrosoftPasswordVerifyReport)report).microsoftCode;
AuthCodePassword codePassword = (AuthCodePassword) password;
var code = codePassword.code;
var token = sendMicrosoftOAuthTokenRequest(code);
if(token == null) {
throw new AuthException("Microsoft auth error: oauth token");
}
if(minecraftAccess) {

try {
return AuthManager.AuthReport.ofOAuthWithMinecraft(getMinecraftTokenByMicrosoftToken(token.access_token), token.access_token, token.refresh_token, token.expires_in, getUserSessionByOAuthAccessToken(token.access_token));
} catch (OAuthAccessTokenExpired e) {
throw new IOException(e);
try {
var session = getUserSessionByOAuthAccessToken(token.access_token);
if(minecraftAccess) {
return AuthManager.AuthReport.ofOAuthWithMinecraft(getMinecraftTokenByMicrosoftToken(token.access_token), token.access_token, token.refresh_token, token.expires_in, session);
} else {
return AuthManager.AuthReport.ofOAuth(token.access_token, token.refresh_token, token.expires_in, session);
}
} else {
return AuthManager.AuthReport.ofOAuth(token.access_token, token.refresh_token, token.expires_in);
} catch (OAuthAccessTokenExpired e) {
throw new AuthException("Internal Auth Error: Token invalid");
}
}

Expand Down

0 comments on commit dced154

Please sign in to comment.