jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

list: add role to s3 lists

Browse source 
fixes: #12
This commit is contained in:
Iain Learmonth 2022-05-11 16:12:52 +01:00
parent efb74ae413
commit 54a2c457f0
6 changed files with 62 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/portal/forms.py
View file

@ -11,5 +11,3 @@ class EditMirrorForm(FlaskForm):
class EditProxyForm(FlaskForm):
origin = SelectField('Origin')
submit = SubmitField('Save Changes')

12
app/portal/list.py
View file

@ -55,8 +55,6 @@ def list_new(group_id=None):
("bca", "Bypass Censorship Analytics"),
("bridgelines", "Tor Bridge Lines")
]
form.container.description = "GitHub Project, GitLab Project or AWS S3 bucket name."
form.branch.description = "Ignored for AWS S3."
if form.validate_on_submit():
list_ = MirrorList()
list_.provider = form.provider.data
@ -64,6 +62,7 @@ def list_new(group_id=None):
list_.description = form.description.data
list_.container = form.container.data
list_.branch = form.branch.data
list_.role = form.role.data
list_.filename = form.filename.data
list_.created = datetime.utcnow()
list_.updated = datetime.utcnow()
@ -85,7 +84,12 @@ class NewMirrorListForm(FlaskForm):
provider = SelectField('Provider', validators=[DataRequired()])
format = SelectField('Distribution Method', validators=[DataRequired()])
description = StringField('Description', validators=[DataRequired()])
container = StringField('Container', validators=[DataRequired()])
branch = StringField('Branch')
container = StringField('Container', validators=[DataRequired()],
description="GitHub Project, GitLab Project or AWS S3 bucket name.")
branch = StringField('Git Branch/AWS Region', validators=[DataRequired()],
description="For GitHub/GitLab, set this to the desired branch name, e.g. main. For AWS S3, "
"set this field to the desired region, e.g. us-east-1.")
role = StringField('Role ARN',
description="(Optional) ARN for IAM role to assume for interaction with the S3 bucket.")
filename = StringField('Filename', validators=[DataRequired()])
submit = SubmitField('Save Changes')

24
app/portal/templates/base.html.j2
View file

@ -88,35 +88,35 @@
Onion Services
</a>
</li>
<li class="nav-item">
<a class="nav-link{% if section == "list" %} active{% endif %}"
href="{{ url_for("portal.list.list_list") }}">
Mirror Lists
</a>
</li>
<li class="nav-item">
<a class="nav-link{% if section == "bridgeconf" %} active{% endif %}"
href="{{ url_for("portal.bridgeconf.bridgeconf_list") }}">
Tor Bridges
</a>
</li>
<li class="nav-item">
<a class="nav-link{% if section == "list" %} active{% endif %}"
href="{{ url_for("portal.list.list_list") }}">
Mirror Lists
</a>
</li>
</ul>
<h6 class="sidebar-heading d-flex justify-content-between align-items-center px-3 mt-4 mb-1 text-muted">
<span>Infrastructure</span>
</h6>
<ul class="nav flex-column">
<li class="nav-item">
<a class="disabled nav-link{% if section == "eotk" %} active{% endif %}"
href="#">
EOTK Instances
</a>
</li>
<li class="nav-item">
<a class="nav-link{% if section == "proxy" %} active{% endif %}"
href="{{ url_for("portal.proxy.proxy_list") }}">
Proxies
</a>
</li>
<li class="nav-item">
<a class="nav-link{% if section == "eotk" %} active{% endif %}"
href="#">
EOTK Instances
</a>
</li>
<li class="nav-item">
<a class="nav-link{% if section == "bridge" %} active{% endif %}"
href="{{ url_for("portal.bridge.bridge_list") }}">