Skip to content

Commit

Permalink
removes dead tor code (#5629)
Browse files Browse the repository at this point in the history
this isn't enabled on the live server, nor would it ever be

:cl:
server: tor banning functionality is removed
/:cl:
  • Loading branch information
harryob authored Feb 12, 2024
1 parent 65aec78 commit dde13a9
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 106 deletions.
2 changes: 0 additions & 2 deletions code/controllers/configuration/entries/general.dm
Original file line number Diff line number Diff line change
Expand Up @@ -491,8 +491,6 @@ This maintains a list of ip addresses that are able to bypass topic filtering.

/datum/config_entry/flag/respawn

/datum/config_entry/flag/ToRban

/datum/config_entry/flag/ooc_country_flags

/datum/config_entry/flag/record_rounds
Expand Down
4 changes: 0 additions & 4 deletions code/game/world.dm
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,6 @@ GLOBAL_LIST_INIT(reboot_sfx, file2list("config/reboot_sfx.txt"))
GLOB.obfs_x = rand(-500, 500) //A number between -100 and 100
GLOB.obfs_y = rand(-500, 500) //A number between -100 and 100

spawn(3000) //so we aren't adding to the round-start lag
if(CONFIG_GET(flag/ToRban))
ToRban_autoupdate()

// If the server's configured for local testing, get everything set up ASAP.
// Shamelessly stolen from the test manager's host_tests() proc
if(testing_locally)
Expand Down
8 changes: 1 addition & 7 deletions code/modules/admin/IsBanned.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
message_admins("Failed Login: [key] - Guests not allowed")
return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.")

// wait for database to be ready
WAIT_DB_READY
if(GLOB.admin_datums[ckey] && (GLOB.admin_datums[ckey].rights & R_MOD))
return ..()
Expand All @@ -26,13 +27,6 @@

var/datum/entity/player/P = get_player_from_key(ckey)

//check if the IP address is a known TOR node
if(CONFIG_GET(flag/ToRban) && ToRban_isbanned(address))
log_access("Failed Login: [src] - Banned: ToR")
message_admins("Failed Login: [src] - Banned: ToR")
return list("reason"="Using ToR", "desc"="\nReason: The network you are using to connect has been banned.\nIf you believe this is a mistake, please request help at [CONFIG_GET(string/banappeals)]")

// wait for database to be ready

. = P.check_ban(computer_id, address)
if(.)
Expand Down
88 changes: 0 additions & 88 deletions code/modules/admin/ToRban.dm

This file was deleted.

1 change: 0 additions & 1 deletion code/modules/admin/admin_verbs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ GLOBAL_LIST_INIT(admin_verbs_possess, list(
))

GLOBAL_LIST_INIT(admin_verbs_permissions, list(
/client/proc/ToRban,
/client/proc/whitelist_panel,
))

Expand Down
1 change: 0 additions & 1 deletion colonialmarines.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1397,7 +1397,6 @@
#include "code\modules\admin\stickyban.dm"
#include "code\modules\admin\STUI.dm"
#include "code\modules\admin\tag.dm"
#include "code\modules\admin\ToRban.dm"
#include "code\modules\admin\medal_panel\medals_panel.dm"
#include "code\modules\admin\medal_panel\medals_panel_tgui.dm"
#include "code\modules\admin\player_panel\player_action.dm"
Expand Down
3 changes: 0 additions & 3 deletions config/example/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,6 @@ BANAPPEALS https://cm-ss13.com/viewforum.php?f=76
##Defines the ticklag for the world. 0.9 is the normal one, 0.5 is smoother.
TICKLAG 0.5

## Uncomment this to ban use of ToR
#TOR_BAN

## Uncomment this to have country flags pop up in OOC alongside names if the user has the pref turned on (uses IP-API)
#OOC_COUNTRY_FLAGS

Expand Down

0 comments on commit dde13a9

Please sign in to comment.