Skip to content

Commit

Permalink
Add API validation when creating ReceptorAddress
Browse files Browse the repository at this point in the history
- websocket_path can only be set if protocol is ws
- is_internal must be False
- only 1 address per instance can have
peers_from_control_nodes set to True

Signed-off-by: Seth Foster <fosterbseth@gmail.com>
  • Loading branch information
fosterseth committed Nov 9, 2023
1 parent 3d2b159 commit de9a001
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 24 deletions.
54 changes: 33 additions & 21 deletions awx/api/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -5389,11 +5389,34 @@ class ReceptorAddressSerializer(BaseSerializer):
class Meta:
model = ReceptorAddress
fields = ('id', 'url', 'address', 'port', 'protocol', 'websocket_path', 'is_internal', 'instance', 'peers_from_control_nodes', 'full_address')
read_only = 'full_address'
read_only_fields = ('full_address',)

def get_full_address(self, obj):
return obj.get_full_address()

def validate(self, attrs):
def get_field_from_model_or_attrs(fd):
return attrs.get(fd, self.instance and getattr(self.instance, fd) or None)

peers_from_control_nodes = get_field_from_model_or_attrs('peers_from_control_nodes')
instance = get_field_from_model_or_attrs('instance')

# only allow websocket_path to be set if protocol is ws
if attrs.get('protocol') != 'ws' and attrs.get('websocket_path'):
raise serializers.ValidationError(_("Can only set websocket path if protocol is ws"))

# an instance can only have one address with peers_from_control_nodes set to True
if peers_from_control_nodes:
for other_address in ReceptorAddress.objects.filter(instance=instance.id):
if other_address.peers_from_control_nodes:
raise serializers.ValidationError(_("Only one address can set peers_from_control_nodes to True"))

# is_internal should be False
if attrs.get('is_internal') == True:
raise serializers.ValidationError(_("Only external addresses can be created"))

return super().validate(attrs)


class InstanceSerializer(BaseSerializer):
show_capabilities = ['edit']
Expand Down Expand Up @@ -5501,35 +5524,24 @@ def check_peers_changed():
'''
return True if
- 'peers' in attrs
- instance peers matches peers in attrs
- instance peers does not match peers in attrs
'''
return self.instance and 'peers' in attrs and set(self.instance.peers.all()) != set(attrs['peers'])

if not self.instance and not settings.IS_K8S:
raise serializers.ValidationError(_("Can only create instances on Kubernetes or OpenShift."))

node_type = get_field_from_model_or_attrs("node_type")
# peers = attrs.get('peers', [])

# if node_type in [Instance.Types.CONTROL, Instance.Types.HYBRID]:
# if check_peers_changed():
# raise serializers.ValidationError(
# _("Setting peers manually for control nodes is not allowed. Enable peers_from_control_nodes on the hop and execution nodes instead.")
# )

# if not listener_port and peers_from_control_nodes:
# raise serializers.ValidationError(_("Field listener_port must be a valid integer when peers_from_control_nodes is enabled."))

# if not listener_port and self.instance and self.instance.peers_from.exists():
# raise serializers.ValidationError(_("Field listener_port must be a valid integer when other nodes peer to it."))

# for peer in peers:
# if peer.listener_port is None:
# raise serializers.ValidationError(_("Field listener_port must be set on peer ") + peer.hostname + ".")
if node_type in [Instance.Types.CONTROL, Instance.Types.HYBRID]:
if check_peers_changed():
raise serializers.ValidationError(
_("Setting peers manually for control nodes is not allowed. Enable peers_from_control_nodes on the hop and execution nodes instead.")
)

# if not settings.IS_K8S:
# if check_peers_changed():
# raise serializers.ValidationError(_("Cannot change peers."))
if not settings.IS_K8S:
if check_peers_changed():
raise serializers.ValidationError(_("Cannot change peers."))

return super().validate(attrs)

Expand Down
10 changes: 8 additions & 2 deletions awx/main/migrations/0188_inbound_hop_nodes.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Generated by Django 4.2.6 on 2023-11-02 18:07
# Generated by Django 4.2.6 on 2023-11-09 19:11

import django.core.validators
from django.db import migrations, models
import django.db.models.deletion

Expand All @@ -15,7 +16,12 @@ class Migration(migrations.Migration):
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('address', models.CharField(max_length=255)),
('port', models.IntegerField(default=27199)),
(
'port',
models.IntegerField(
default=27199, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(65535)]
),
),
('protocol', models.CharField(default='tcp', max_length=10)),
('websocket_path', models.CharField(blank=True, default='', max_length=255)),
('is_internal', models.BooleanField(default=False)),
Expand Down
3 changes: 2 additions & 1 deletion awx/main/models/receptor_address.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.db import models
from django.core.validators import MinValueValidator, MaxValueValidator
from django.utils.translation import gettext_lazy as _
from django.db.models.signals import post_save, post_delete
from django.dispatch import receiver
Expand All @@ -18,7 +19,7 @@ class Meta:
]

address = models.CharField(max_length=255)
port = models.IntegerField(default=27199)
port = models.IntegerField(default=27199, validators=[MinValueValidator(0), MaxValueValidator(65535)])
protocol = models.CharField(max_length=10, default="tcp")
websocket_path = models.CharField(max_length=255, default="", blank=True)
is_internal = models.BooleanField(default=False)
Expand Down

0 comments on commit de9a001

Please sign in to comment.