mirror of
https://gitlab.com/SIGBUS/nyaa.git
synced 2024-12-22 23:30:01 +00:00
a38e5d5b53
* Implement range bans People connecting from banned IP ranges are unable to upload torrents anonymously, and need to manually have their accounts activated. This adds a new table "rangebans", and a command line utility, "rangeban.py", which can be used to add, list and remove rangebans from the command line. As an example: ./rangeban.py ban 192.168.0.0/24 This would rangeban anything in this /24. The temporary_tor column allows automated scripts to clean out and re-add ever-changing sets of ranges to be banned without affecting the other ranges. This has only been tested for IPv4. * Revise Rangebans Add an id column, and change "temporary_tor" to "temp". Also index masked_cidr and mask. * rangebans: fix enabled and the binary op kill me * Add enabling/disabling bans to rangeban.py * rangebans: fail earlier on garbage arguments * rangebans: fix linter errors * rangeban.py: don't shadow builtin keyword 'id' * rangebans: change temporary ban logic, column The 'temp' column is now a nullable time column. If the field is null, the ban is understood to be permanent. If there is a time in there, it's understood to be the creation time of the ban. This allows scripts to e.g. delete all temporary bans older than a certain amount of time. Also, rename the '_cidr_string' column to 'cidr_string', because reasons. * rangeban.py: use ip_address to parse CIDR subnet * rangebans: fixes to the mask calculation and query Both were not bugs per-se, but just technically not needed/correct. * De-meme apparently
41 lines
1.3 KiB
Python
41 lines
1.3 KiB
Python
"""add rangebans
|
|
|
|
Revision ID: f69d7fec88d6
|
|
Revises: 6cc823948c5a
|
|
Create Date: 2018-06-01 14:01:49.596007
|
|
|
|
"""
|
|
from alembic import op
|
|
import sqlalchemy as sa
|
|
|
|
|
|
# revision identifiers, used by Alembic.
|
|
revision = 'f69d7fec88d6'
|
|
down_revision = '6cc823948c5a'
|
|
branch_labels = None
|
|
depends_on = None
|
|
|
|
|
|
def upgrade():
|
|
# ### commands auto generated by Alembic - please adjust! ###
|
|
op.create_table('rangebans',
|
|
sa.Column('id', sa.Integer(), nullable=False),
|
|
sa.Column('cidr_string', sa.String(length=18), nullable=False),
|
|
sa.Column('masked_cidr', sa.BigInteger(), nullable=False),
|
|
sa.Column('mask', sa.BigInteger(), nullable=False),
|
|
sa.Column('enabled', sa.Boolean(), nullable=False),
|
|
sa.Column('temp', sa.DateTime(), nullable=True),
|
|
sa.PrimaryKeyConstraint('id')
|
|
)
|
|
op.create_index(op.f('ix_rangebans_mask'), 'rangebans', ['mask'], unique=False)
|
|
op.create_index(op.f('ix_rangebans_masked_cidr'), 'rangebans', ['masked_cidr'], unique=False)
|
|
# ### end Alembic commands ###
|
|
|
|
|
|
def downgrade():
|
|
# ### commands auto generated by Alembic - please adjust! ###
|
|
op.drop_index(op.f('ix_rangebans_masked_cidr'), table_name='rangebans')
|
|
op.drop_index(op.f('ix_rangebans_mask'), table_name='rangebans')
|
|
op.drop_table('rangebans')
|
|
# ### end Alembic commands ###
|