Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate RCON connectivity from CServerRcon to SourceQuery #612

Merged
merged 29 commits into from
Oct 12, 2019
Merged

Migrate RCON connectivity from CServerRcon to SourceQuery #612

merged 29 commits into from
Oct 12, 2019

Conversation

Groruk
Copy link
Member

@Groruk Groruk commented Sep 28, 2019 •
edited
Loading

Description

Finally migrate RCON connectivity from CServerRcon to SourceQuery.
Also update the Status parser regex.

Fixes #474
Fixes #610

How Has This Been Tested?

Tests:

  • Test Status regex in multiple games (tf2, csgo, css, etc.)
  • KickPlayer() in admin.kickit.php
  • BlockPlayer() in admin.blockit.php
  • checkMultiplePlayers()
  • PasteBlock()
  • SendMessage()
  • ViewCommunityProfile()
  • RehashAdmins()
  • SendRcon()
  • KickPlayer()

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.

Groruk added 15 commits September 28, 2019 17:20
@Groruk
Remove flight
628ec74 
flight framework goes unused in 1.7.0
@Groruk
Add new RCON functions
435a9fe
@Groruk
Remove old status regex
e5fb761
@Groruk
Update RCON function calls
40a408c
@Groruk
Rework admin.kickit.php KickPlayer() function
4674cfb
@Groruk
Rework admin.blockit.php BlockPlayer() function
fc1b89b
@Groruk
Rework checkMultiplePlayers() function
89df118
@Groruk
Rework PasteBlock() function
97ede8b
@Groruk
Rework SendMessage() function
6526e17
@Groruk
Rework ViewCommunityProfile() function
4e95f92
@Groruk
Rework RehashAdmins() function
f842b59
@Groruk
Rework SendRcon() function
8f918aa
@Groruk
Rework KickPlayer() function
2894b1f
@Groruk
Remove old CServerRcon.php
1e01716
@Groruk
Filter both names before comparing
502f30b 
Currently all $_GET and $_POST data gets filtered with FILTER_SANITIZE_STRING, to combat this in player name checks we now filter both names before comparing them. (Should fix sbpp#610)
@Groruk Groruk marked this pull request as ready for review October 9, 2019 20:49
@Groruk Groruk requested a review from rumblefrog October 9, 2019 20:59
@Groruk Groruk changed the title [WIP] Migrate RCON connectivity from CServerRcon to SourceQuery Migrate RCON connectivity from CServerRcon to SourceQuery Oct 9, 2019
rumblefrog
rumblefrog approved these changes Oct 10, 2019
View reviewed changes
Copy link
Member

@rumblefrog rumblefrog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks excellent from a glance; however, I won't be able to test this until Friday.

@Groruk Groruk merged commit de2444b into sbpp:v1.x Oct 12, 2019
@Groruk Groruk deleted the rcon-migration branch October 12, 2019 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CrazyHackGUT CrazyHackGUT CrazyHackGUT left review comments

@rumblefrog rumblefrog rumblefrog approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@Groruk @rumblefrog @CrazyHackGUT