From 57a648674fd0f477d878e5c0d20bae97b9ec9fb6 Mon Sep 17 00:00:00 2001 From: Major Date: Mon, 29 May 2017 09:14:26 +0100 Subject: [PATCH 1/6] Fix contributing link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 26786ba1..d682bbeb 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,4 @@ Apollo is now ready, and can be started using `gradle run`. You may wish to chan ### Contributing -Please see [contributing to Apollo](#CONTRIBUTING.md). +Please see [contributing to Apollo](CONTRIBUTING.md). From ee78d2cd05b09782de90446a933bc1752438dbc1 Mon Sep 17 00:00:00 2001 From: Lmctruck30 Date: Sun, 10 Sep 2017 06:02:27 -0700 Subject: [PATCH 2/6] Fix magic.rb (#344) Fix magic level check --- data/plugins/skill/magic/magic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/plugins/skill/magic/magic.rb b/data/plugins/skill/magic/magic.rb index 43bedb89..71ddcfb4 100644 --- a/data/plugins/skill/magic/magic.rb +++ b/data/plugins/skill/magic/magic.rb @@ -61,7 +61,7 @@ class SpellAction < Action def check_skill required = @spell.level - if required > mob.skill_set.skill(Skill::MAGIC).current_level + if required > mob.skill_set.getSkill(Skill::MAGIC).current_level mob.send_message("You need a Magic level of at least #{required} to cast this spell.") return false end From ddc7beeeeaa7ea0e3cf38f608cee5e906e81df7c Mon Sep 17 00:00:00 2001 From: Kyle Stevenson Date: Mon, 18 Sep 2017 07:40:31 -0700 Subject: [PATCH 3/6] Add RSA key gen Gradle task Fixes #325 --- util/build.gradle | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/util/build.gradle b/util/build.gradle index 80b6ad3d..bbfee750 100644 --- a/util/build.gradle +++ b/util/build.gradle @@ -1 +1,11 @@ description = 'Apollo Utilities' + +task(genRsa, dependsOn: classes, type: JavaExec) { + def utilSubproject = project(':util') + def utilClasspath = utilSubproject.sourceSets.main.runtimeClasspath + + main = 'org.apollo.util.tools.RsaKeyGenerator' + classpath = utilClasspath + jvmArgs = ['-Xmx1024M'] + workingDir = project.rootDir +} From 1537aa8b93766462a32889fd3bdb78a6b694e5a6 Mon Sep 17 00:00:00 2001 From: Kyle Stevenson Date: Mon, 18 Sep 2017 07:51:08 -0700 Subject: [PATCH 4/6] Add logging to LoginDecoder for session rejections Fixes #322 --- .../org/apollo/net/codec/login/LoginDecoder.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/net/src/main/org/apollo/net/codec/login/LoginDecoder.java b/net/src/main/org/apollo/net/codec/login/LoginDecoder.java index 394d70d5..b59cc70e 100644 --- a/net/src/main/org/apollo/net/codec/login/LoginDecoder.java +++ b/net/src/main/org/apollo/net/codec/login/LoginDecoder.java @@ -9,6 +9,7 @@ import java.math.BigInteger; import java.net.InetSocketAddress; import java.security.SecureRandom; import java.util.List; +import java.util.logging.Logger; import org.apollo.cache.FileSystemConstants; import org.apollo.net.NetworkConstants; @@ -27,6 +28,11 @@ import com.google.common.net.InetAddresses; */ public final class LoginDecoder extends StatefulFrameDecoder { + /** + * The logger for this class. + */ + private static final Logger logger = Logger.getLogger(LoginDecoder.class.getName()); + /** * The secure random number generator. */ @@ -110,6 +116,7 @@ public final class LoginDecoder extends StatefulFrameDecoder int type = buffer.readUnsignedByte(); if (type != LoginConstants.TYPE_STANDARD && type != LoginConstants.TYPE_RECONNECTION) { + logger.fine("Failed to decode login header."); writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION); return; } @@ -137,6 +144,7 @@ public final class LoginDecoder extends StatefulFrameDecoder int memoryStatus = payload.readUnsignedByte(); if (memoryStatus != 0 && memoryStatus != 1) { + logger.fine("Login memoryStatus (" + memoryStatus + ") not in expected range of [0, 1]."); writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION); return; } @@ -150,6 +158,7 @@ public final class LoginDecoder extends StatefulFrameDecoder int length = payload.readUnsignedByte(); if (length != loginLength - 41) { + logger.fine("Login packet unexpected length (" + length + ")"); writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION); return; } @@ -162,6 +171,7 @@ public final class LoginDecoder extends StatefulFrameDecoder int id = secure.readUnsignedByte(); if (id != 10) { + logger.fine("Unable to read id from secure payload."); writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION); return; } @@ -169,6 +179,7 @@ public final class LoginDecoder extends StatefulFrameDecoder long clientSeed = secure.readLong(); long reportedSeed = secure.readLong(); if (reportedSeed != serverSeed) { + logger.fine("Reported seed differed from server seed."); writeResponseCode(ctx, LoginConstants.STATUS_LOGIN_SERVER_REJECTED_SESSION); return; } @@ -180,6 +191,7 @@ public final class LoginDecoder extends StatefulFrameDecoder String hostAddress = InetAddresses.toAddrString(socketAddress.getAddress()); if (password.length() < 6 || password.length() > 20 || username.isEmpty() || username.length() > 12) { + logger.fine("Username ('" + username + "') or password did not pass validation."); writeResponseCode(ctx, LoginConstants.STATUS_INVALID_CREDENTIALS); return; } From 68183eaf22baa819cdbba6518d75d25a46c2ea1f Mon Sep 17 00:00:00 2001 From: Gary Tierney Date: Thu, 28 Sep 2017 19:57:59 +0100 Subject: [PATCH 5/6] Add Slack invite link to the README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d682bbeb..5cb0b57b 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Apollo is a high-performance, modular RuneScape emulator with a collection of ut ### Developer information -Most discussion related to the development of Apollo happens on the IRC channel _#apollorsps_ on _irc.freenode.net_. If you have a problem and can't get in touch with anyone, create a GitHub issue. If making a pull request, please make sure all tests are still passing after making your changes, and that your code style is consistent with the rest of Apollo. +Most discussion related to the development of Apollo happens on our [Slack team](https://join.slack.com/t/apollo-rsps/shared_invite/enQtMjQ0NTYwNzkwMjExLTI5NGVmOWZjZGRkYzY4NjM1MjgxNjYyYmEyZWQxMzcxZTA5NDM1MGJkNmRkMjc2ZDQ2NjUwMjAzOGI1NjY1Zjk). If you have a problem and can't get in touch with anyone, create a GitHub issue. If making a pull request, please make sure all tests are still passing after making your changes, and that your code style is consistent with the rest of Apollo. ### Getting started From 2f71097380746c4c6345bce73d62827be64dc848 Mon Sep 17 00:00:00 2001 From: Gary Tierney Date: Sun, 28 Jan 2018 18:02:06 +0000 Subject: [PATCH 6/6] Add Acknowledgements section to the README Also add list of services we're using via open source licensing models (YourKit and Travis-CI). --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/README.md b/README.md index 5cb0b57b..208f7ba2 100644 --- a/README.md +++ b/README.md @@ -20,3 +20,21 @@ Apollo is now ready, and can be started using `gradle run`. You may wish to chan ### Contributing Please see [contributing to Apollo](CONTRIBUTING.md). + +### Acknowledgements + +We'd like to thank the list of service providers/development tool vendors below for offering their products to the Apollo project free of charge. + +--- + +#### [![YourKit](https://www.yourkit.com/images/yklogo.png)](https://www.yourkit.com/java/profiler/index.jsp) + +YourKit supports open source projects with its full-featured Java Profiler. +YourKit, LLC is the creator of YourKit Java Profiler +and YourKit .NET Profiler, +innovative and intelligent tools for profiling Java and .NET applications. + +#### [Travis CI](https://travis-ci.org) + +Travis CI is a Continuous Integration platform that allows for setup of automated testing with minimal configuration. +