pylint fixes

This commit is contained in:
Ruben van Staveren 2022-03-10 14:03:09 +01:00
parent 64523ae8b5
commit bd12b2a18a
Signed by: ruben
GPG Key ID: 886F6BECD477A93F
2 changed files with 12 additions and 18 deletions

View File

@ -1,14 +1,6 @@
import base64 import base64
from types import SimpleNamespace from types import SimpleNamespace
pfctl_stdout_lines = b'''
block drop quick proto tcp from <f2b-sendmail-auth> to any port = submission
block drop quick proto tcp from <f2b-sendmail-auth> to any port = smtps
block drop quick proto tcp from <f2b-sendmail-auth> to any port = smtp
block drop quick proto tcp from <f2b-sshd> to any port = ssh
block drop quick proto tcp from <f2b-recidive> to any
'''
def test_ban_ipv6(client, mocker): def test_ban_ipv6(client, mocker):
def noop(): def noop():
@ -16,36 +8,35 @@ def test_ban_ipv6(client, mocker):
run_res = SimpleNamespace() run_res = SimpleNamespace()
run_res.stdout = b'' run_res.stdout = b''
run_res.stderr = b'1/1 addresses added.\n' run_res.stderr = b'1/1 addresses added.\n'
run_res.returncode=0 run_res.returncode = 0
run_res.check_returncode = noop run_res.check_returncode = noop
mocker.patch('jail2ban.pfctl.run', return_value=run_res) mocker.patch('jail2ban.pfctl.run', return_value=run_res)
valid_credentials = base64.b64encode(b"test.example.com:testpassword").decode("utf-8") valid_credentials = base64.b64encode(b"test.example.com:testpassword").decode("utf-8")
json_payload = {"name":"sshd","ip":"2001:db8::abad:cafe"} json_payload = {"name": "sshd", "ip": "2001:db8::abad:cafe"}
response = client.put("/ban", response = client.put("/ban",
json=json_payload, json=json_payload,
headers={"Authorization": "Basic " + valid_credentials}) headers={"Authorization": "Basic " + valid_credentials})
assert response.json['operation'] == 'add' assert response.json['operation'] == 'add'
def test_ban_ipv4(client, mocker): def test_ban_ipv4(client, mocker):
def noop(): def noop():
pass pass
run_res = SimpleNamespace() run_res = SimpleNamespace()
run_res.stdout = b'' run_res.stdout = b''
run_res.stderr = b'1/1 addresses added.\n' run_res.stderr = b'1/1 addresses added.\n'
run_res.returncode=0 run_res.returncode = 0
run_res.check_returncode = noop run_res.check_returncode = noop
mocker.patch('jail2ban.pfctl.run', return_value=run_res) mocker.patch('jail2ban.pfctl.run', return_value=run_res)
valid_credentials = base64.b64encode(b"test.example.com:testpassword").decode("utf-8") valid_credentials = base64.b64encode(b"test.example.com:testpassword").decode("utf-8")
json_payload = {"name":"sshd","ip":"192.0.2.42"} json_payload = {"name": "sshd", "ip": "192.0.2.42"}
response = client.put("/ban", response = client.put("/ban",
json=json_payload, json=json_payload,
headers={"Authorization": "Basic " + valid_credentials}) headers={"Authorization": "Basic " + valid_credentials})
assert response.json['operation'] == 'add' assert response.json['operation'] == 'add'

View File

@ -11,7 +11,9 @@ block drop quick proto tcp from <f2b-recidive> to any
def test_request_unauth(client): def test_request_unauth(client):
json_payload = {"port": "any port {pop3,pop3s,imap,imaps,submission,465,sieve}", "name": "dovecot", "protocol": "tcp"} json_payload = {"port":
"any port {pop3,pop3s,imap,imaps,submission,465,sieve}",
"name": "dovecot", "protocol": "tcp"}
response = client.put("/register", json=json_payload) response = client.put("/register", json=json_payload)
assert response.json['error'] == 'Access Denied' assert response.json['error'] == 'Access Denied'
@ -26,12 +28,13 @@ def test_request_example(client, mocker):
mocker.patch('jail2ban.pfctl.run', return_value=run_res) mocker.patch('jail2ban.pfctl.run', return_value=run_res)
valid_credentials = base64.b64encode(b"test.example.com:testpassword").decode("utf-8") valid_credentials = base64.b64encode(b"test.example.com:testpassword").decode("utf-8")
json_payload = {"port": "any port {pop3,pop3s,imap,imaps,submission,465,sieve}", "name": "dovecot", "protocol": "tcp"} json_payload = {"port":
"any port {pop3,pop3s,imap,imaps,submission,465,sieve}",
"name": "dovecot", "protocol": "tcp"}
response = client.put("/register", response = client.put("/register",
json=json_payload, json=json_payload,
headers={"Authorization": "Basic " + valid_credentials}) headers={"Authorization": "Basic " + valid_credentials})
assert response.json['remote_user'] == 'test.example.com' assert response.json['remote_user'] == 'test.example.com'