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

add only approved players to team instances #1051

Merged
merged 2 commits into from
Nov 17, 2023
Merged

add only approved players to team instances #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e92771c
add only approved players
proditis Nov 17, 2023
02ccbf1
Make sure teamPlayer is approved
proditis Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions backend/commands/CronController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,11 +174,11 @@ public function actionInstancePf($before=60)
{
case SELF::ACTION_START:
case SELF::ACTION_RESTART:
if(($val->team_allowed===true && $val->player->teamPlayer) || \Yii::$app->sys->team_visible_instances===true)
if(($val->team_allowed===true && $val->player->teamPlayer && $val->player->teamPlayer->approved===1) || \Yii::$app->sys->team_visible_instances===true)
{
foreach($val->player->teamPlayer->team->teamPlayers as $teamPlayer)
{
if($teamPlayer->player->last->vpn_local_address!==null && $teamPlayer->player->last->vpn_local_address!==0)
if($teamPlayer->player->last->vpn_local_address!==null && $teamPlayer->player->last->vpn_local_address!==0 && $teamPlayer->approved===1)
{
$ips[]=long2ip($teamPlayer->player->last->vpn_local_address);
}
Expand Down Expand Up @@ -275,11 +275,11 @@ public function actionInstances($pfonly=false)
$dc->pull();
$dc->spin();
}
if(($val->team_allowed===true && $val->player->teamPlayer) || \Yii::$app->sys->team_visible_instances===true)
if(($val->team_allowed===true && $val->player->teamPlayer && $val->player->teamPlayer->approved===1) || \Yii::$app->sys->team_visible_instances===true)
{
foreach($val->player->teamPlayer->team->teamPlayers as $teamPlayer)
{
if($teamPlayer->player->last->vpn_local_address!==null)
if($teamPlayer->player->last->vpn_local_address!==null && $teamPlayer->approved===1)
{
$ips[]=long2ip($teamPlayer->player->last->vpn_local_address);
}
Expand Down
8 changes: 4 additions & 4 deletions contrib/echoctf_updown_mysql.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ if [ "$script_type" == "client-connect" ]; then
done
# Add to private instances of our own and our team mates
TEAM_VISIBLE_INSTANCES=$(echo "get sysconfig:team_visible_instances"|nc ${NCOPTS} ${MEMD} 11211 |egrep -v "(VALUE|END)")
TEAMS_QUERY="SELECT LOWER(CONCAT(t2.name,'_',player_id)) AS net FROM target_instance as t1 LEFT JOIN target as t2 on t1.target_id=t2.id WHERE player_id=${common_name} or player_id IN (SELECT player_id from team_player WHERE team_id IN (SELECT team_id FROM team_player where player_id=${common_name}))"
TEAMS_QUERY="SELECT LOWER(CONCAT(t2.name,'_',player_id)) AS net FROM target_instance as t1 LEFT JOIN target as t2 on t1.target_id=t2.id WHERE player_id=${common_name} or player_id IN (SELECT player_id from team_player WHERE team_id IN (SELECT team_id FROM team_player where player_id=${common_name} and approved=1))"
if [ "$TEAM_VISIBLE_INSTANCES" == "" ]; then
TEAMS_QUERY="SELECT LOWER(CONCAT(t2.name,'_',player_id)) AS net FROM target_instance as t1 LEFT JOIN target as t2 on t1.target_id=t2.id WHERE player_id=${common_name} or (player_id IN (SELECT player_id from team_player WHERE team_id IN (SELECT team_id FROM team_player where player_id=${common_name})) AND team_allowed=1)"
TEAMS_QUERY="SELECT LOWER(CONCAT(t2.name,'_',player_id)) AS net FROM target_instance as t1 LEFT JOIN target as t2 on t1.target_id=t2.id WHERE player_id=${common_name} or (player_id IN (SELECT player_id from team_player WHERE team_id IN (SELECT team_id FROM team_player where player_id=${common_name} and approved=1)) AND team_allowed=1)"
fi
for network in $(mysql -h ${DBHOST} -u"${DBUSER}" -p"${DBPASS}" echoCTF -NBe "$TEAMS_QUERY");do
/sbin/pfctl -t "${network}_clients" -T add ${ifconfig_pool_remote_ip}
Expand All @@ -50,9 +50,9 @@ elif [ "$script_type" == "client-disconnect" ]; then
/sbin/pfctl -t "${network}_clients" -T delete ${ifconfig_pool_remote_ip}
done
TEAM_VISIBLE_INSTANCES=$(echo "get sysconfig:team_visible_instances"|nc ${NCOPTS} ${MEMD} 11211 |egrep -v "(VALUE|END)")
TEAMS_QUERY="SELECT LOWER(CONCAT(t2.name,'_',player_id)) AS net FROM target_instance as t1 LEFT JOIN target as t2 on t1.target_id=t2.id WHERE player_id=${common_name} or player_id IN (SELECT player_id from team_player WHERE team_id IN (SELECT team_id FROM team_player where player_id=${common_name}))"
TEAMS_QUERY="SELECT LOWER(CONCAT(t2.name,'_',player_id)) AS net FROM target_instance as t1 LEFT JOIN target as t2 on t1.target_id=t2.id WHERE player_id=${common_name} or player_id IN (SELECT player_id from team_player WHERE team_id IN (SELECT team_id FROM team_player where player_id=${common_name} and approved=1))"
if [ "$TEAM_VISIBLE_INSTANCES" == "" ]; then
TEAMS_QUERY="SELECT LOWER(CONCAT(t2.name,'_',player_id)) AS net FROM target_instance as t1 LEFT JOIN target as t2 on t1.target_id=t2.id WHERE player_id=${common_name} or (player_id IN (SELECT player_id from team_player WHERE team_id IN (SELECT team_id FROM team_player where player_id=${common_name})) AND team_allowed=1)"
TEAMS_QUERY="SELECT LOWER(CONCAT(t2.name,'_',player_id)) AS net FROM target_instance as t1 LEFT JOIN target as t2 on t1.target_id=t2.id WHERE player_id=${common_name} or (player_id IN (SELECT player_id from team_player WHERE team_id IN (SELECT team_id FROM team_player where player_id=${common_name} and approved=1)) AND team_allowed=1)"
fi

for network in $(mysql -h ${DBHOST} -u"${DBUSER}" -p"${DBPASS}" echoCTF -NBe "$TEAMS_QUERY");do
Expand Down