tanner/spaceport
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Limit sign ups from Protospace only

Browse Source
This commit is contained in:
Tanner Collin 2020-01-17 09:20:55 +00:00
parent df1490dd2d
commit 1839616aa9
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apiserver/apiserver/api/serializers.py
View File

@ -10,6 +10,7 @@ from PIL import Image
from bleach.sanitizer import Cleaner
from . import models, old_models
from .. import settings
#custom_error = lambda x: ValidationError(dict(non_field_errors=x))
@ -303,6 +304,14 @@ class UserSerializer(serializers.ModelSerializer):
depth = 1
def request_from_protospace(request):
whitelist = ['24.66.110.96', '205.233.15.76', '205.233.15.69']
# set (not appended) directly by nginx so we can trust it
real_ip = request.META.get('HTTP_X_REAL_IP', False)
return real_ip in whitelist
class RegistrationSerializer(RegisterSerializer):
first_name = serializers.CharField(max_length=32)
@ -312,6 +321,12 @@ class RegistrationSerializer(RegisterSerializer):
def custom_signup(self, request, user):
data = request.data
is_test_signup = bool(settings.DEBUG and data['last_name'] == 'tester')
if not request_from_protospace(request) and not is_test_signup:
user.delete()
raise ValidationError(dict(non_field_errors='Can only register from Protospace.'))
if data['existing_member'] == 'true':
old_members = old_models.Members.objects.using('old_portal')
try:

4
webclient/src/LoginSignup.js
View File

@ -18,6 +18,7 @@ export function LoginForm(props) {
.then(res => {
setError({});
props.setTokenCache(res.key);
window.scrollTo(0, 0);
})
.catch(err => {
setLoading(false);
@ -72,6 +73,7 @@ export function SignupForm(props) {
.then(res => {
setError({});
props.setTokenCache(res.key);
window.scrollTo(0, 0);
})
.catch(err => {
setLoading(false);
@ -82,7 +84,7 @@ export function SignupForm(props) {
return (
<Form onSubmit={handleSubmit}>
<Header size='medium'>Sign Up</Header>
<Header size='medium'>Sign Up from Protospace</Header>
<Form.Group widths='equal'>
<Form.Input