Skip to content

Commit 85848d0

Browse files
author
Trollhunters501PC
authored
Arreglar error de Filtros en Python
1 parent d384ef5 commit 85848d0

2 files changed

Lines changed: 12 additions & 9 deletions

File tree

java/src/main/java/org/CreadoresProgram/ServerWebGamePost/server/ProcessDatapackServer.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ public ProcessDatapackServer(){
1515

1616
@Override
1717
public Object handle(Request request, Response response) throws Exception{
18-
if(this.server.bannedIps.contains(request.ip())) return null;
18+
if(this.server.bannedIps.contains(request.ip())){
19+
response.status(403);
20+
return "Forbidden";
21+
}
1922
if(!this.server.getFilters().isEmpty() && !this.server.getFilters().contains(request.headers("Origin"))){
2023
response.status(403);
2124
return "Forbidden";
@@ -27,7 +30,7 @@ public Object handle(Request request, Response response) throws Exception{
2730
this.server.getPlayers().get(datapack.getString("identifier")).clear();
2831
response.status(200);
2932
response.type("application/json");
30-
String allow = !this.server.getFilters().isEmpty() ? String.join(",", this.server.getFilters()) : "*";
33+
String allow = (!this.server.getFilters().isEmpty()) ? String.join(",", this.server.getFilters()) : "*";
3134
response.header("Access-Control-Allow-Origin", allow);
3235
response.header("Access-Control-Allow-Methods", "POST");
3336
response.header("Access-Control-Allow-Headers", "Content-Type");

python/ServerWebGamePost/ServerM.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def addFilterOrigin(self, origin):
4444
if self.filters is None:
4545
self.filters = []
4646
self.filters.append(origin)
47-
47+
4848
def removeFilterOrigin(self, origin):
4949
if self.filters is None:
5050
return
@@ -63,18 +63,18 @@ def unbanIp(self, ip):
6363
class ProcessDatapackServer(BaseHTTPRequestHandler):
6464

6565
def do_POST(self):
66-
if(self.server.serverFat.bannedIps is not None and self.client_address[0] in self.server.serverFat.bannedIps):
66+
if (self.server.serverFat.bannedIps is not None and self.client_address[0] in self.server.serverFat.bannedIps):
6767
self.send_response(403)
6868
self.end_headers()
6969
return
7070
url = str(self.path)
7171
if url != "/ServerWebGamePost":
7272
return
73-
if(self.server.serverFat.filters is not None and self.headers['Origin'] not in self.server.serverFat.filters):
73+
if (self.server.serverFat.filters is not None and self.headers['Origin'] not in self.server.serverFat.filters):
7474
self.send_response(403)
7575
self.end_headers()
7676
return
77-
allow = ','.join(self.filters) if self.filters and len(self.filters) > 0 else '*'
77+
allow = ','.join(self.server.serverFat.filters) if self.server.serverFat.filters and len(self.server.serverFat.filters) > 0 else '*'
7878
self.send_header('Access-Control-Allow-Origin', allow)
7979
self.send_header('Access-Control-Allow-Methods', "POST")
8080
self.send_header('Access-Control-Allow-Headers', "Content-Type")
@@ -95,7 +95,7 @@ def do_POST(self):
9595
self.wfile.write(str(e).encode('utf-8'))
9696

9797
def do_GET(self):
98-
if(self.server.serverFat.bannedIps is not None and self.client_address[0] in self.server.serverFat.bannedIps):
98+
if (self.server.serverFat.bannedIps is not None and self.client_address[0] in self.server.serverFat.bannedIps):
9999
self.send_response(403)
100100
self.end_headers()
101101
return
@@ -114,12 +114,12 @@ def do_GET(self):
114114
self.wfile.write(logo.read())
115115

116116
def do_OPTIONS(self):
117-
if(self.server.serverFat.bannedIps is not None and self.client_address[0] in self.server.serverFat.bannedIps):
117+
if (self.server.serverFat.bannedIps is not None and self.client_address[0] in self.server.serverFat.bannedIps):
118118
self.send_response(403)
119119
self.end_headers()
120120
return
121121
self.send_response(200)
122-
allow = ','.join(self.filters) if self.filters and len(self.filters) > 0 else '*'
122+
allow = ','.join(self.server.serverFat.filters) if self.server.serverFat.filters and len(self.server.serverFat.filters) > 0 else '*'
123123
self.send_header('Access-Control-Allow-Origin', allow)
124124
self.send_header('Access-Control-Allow-Methods', "POST")
125125
self.send_header('Access-Control-Allow-Headers', "Content-Type")

0 commit comments

Comments
 (0)