Skip to content
Snippets Groups Projects
Commit a29b74c4 authored by Andrew Sereda's avatar Andrew Sereda
Browse files

Issue #3247108: IP address not written to database table

parent e8cc468d
No related branches found
No related tags found
1 merge request!3Functional test
Hide whitespace changes
Inline Side-by-side
src/Plugin/Field/FieldWidget/IpAddressWidgetBase.php
+ 6
− 1
View file @ a29b74c4
......@@ -123,7 +123,12 @@ class IpAddressWidgetBase extends WidgetBase {
// Convert to storage format.
foreach ($values as &$item) {
if (!empty($value = trim($item['value']))) {
$value = new IpAddress($value);
try {
$value = new IpAddress($value);
}
catch (\Exception $e) {
continue;
}
$item['ip_start'] = inet_pton($value->start());
$item['ip_end'] = inet_pton($value->end());
......
src/Tests/IpAddressFieldTest.php deleted 100755 → 0
+ 0
− 117
View file @ e8cc468d
<?php
namespace Drupal\field_ipaddress\Tests;
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\simpletest\WebTestBase;
/**
* Tests IP address field functionality.
*
* @group field_ipaddress
*/
class IpAddressFieldTest extends WebTestBase {
/**
* Modules to enable.
*
* @var array
*/
public static $modules = [
'node',
'entity_test',
'field_ipaddress',
'field',
'field_ui',
];
/**
* Field name.
*
* @var string
*/
protected $fieldName = 'field_testip';
/**
* {@inheritdoc}
*/
protected function setUp() {
parent::setUp();
$web_user = $this->drupalCreateUser([
'access content',
'view test entity',
'administer entity_test content',
'administer entity_test form display',
'administer content types',
'administer node fields',
]);
$this->drupalLogin($web_user);
$this->fieldStorage = FieldStorageConfig::create([
'field_name' => $this->field_name,
'entity_type' => 'entity_test',
'type' => 'ipaddress',
'settings' => [],
]);
$this->fieldStorage->save();
$this->field = FieldConfig::create([
'field_storage' => $this->fieldStorage,
'bundle' => 'entity_test',
'required' => TRUE,
]);
$this->field->save();
// Create a form display for the default form mode.
entity_get_form_display('entity_test', 'entity_test', 'default')
->setComponent($this->field_name, [
'type' => 'ipaddress_default',
])
->save();
}
/**
* Tests date field functionality.
*/
public function testIpAddressField() {
// Display creation form.
$this->drupalGet('entity_test/add');
$this->assertFieldByName("{$this->field_name}[0][value]", '', "IP address element found ({$this->field_name}[0][value])");
// First put in buggy data.
$edit = [
"{$this->field_name}[0][value]" => 'A255.255.255.255 - 255.255.255.255',
];
$this->drupalPostForm(NULL, $edit, t('Save'));
$this->assertText('Please provide a valid', 'Buggy input has been caught.');
// Second, put in too big span.
$edit = [
"{$this->field_name}[0][value]" => '1.1.1.1 - 255.255.255.255',
];
$this->drupalPostForm(NULL, $edit, t('Save'));
$this->assertText('Please make sure', 'To big IP range has been caught.');
// Put in some data.
$edit = [
"{$this->field_name}[0][value]" => '255.255.255.255 - 255.255.255.255',
];
$this->drupalPostForm(NULL, $edit, t('Save'));
preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
$this->assert(isset($match[1]), "URL matched after entity form submission ({$this->url})");
$id = $match[1];
$this->assertText(t('entity_test @id has been created.', ['@id' => $id]));
$this->assertText($value, 'Data is present on page after form submission.');
// Make sure we can query the data.
$greater_than_value = '255.255.255.254';
$query = \Drupal::entityQuery('entity_test')
->condition($this->field_name . '.ip_from', $greater_than_value, '>');
$nids = $query->execute();
$this->assert((count($nids) == 1), 'Entity query matches number of created entities.');
}
}
tests/src/Functional/IpAddressFieldTest.php 0 → 100644
+ 397
− 0
View file @ a29b74c4
<?php
namespace Drupal\Tests\field_ipaddress\Functional;
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\Tests\BrowserTestBase;
/**
* Tests the ip field functionality.
*
* @group field_ipaddress
*/
class IpAddressFieldTest extends BrowserTestBase {
/**
* {@inheritdoc}
*/
protected static $modules = [
'field_ipaddress',
'node',
];
/**
* {@inheritdoc}
*/
protected $defaultTheme = 'stark';
/**
* The node type to use in tests.
*
* @var \Drupal\node\NodeTypeInterface
*/
protected $nodeType;
/**
* The field name to use in tests.
*
* @var string
*/
protected $fieldName = 'field_test_ip';
/**
* {@inheritdoc}
*/
protected function setUp():void {
parent::setUp();
$this->nodeType = $this->drupalCreateContentType(['type' => 'test_type']);
$this->drupalLogin($this->createUser([
'create test_type content',
]));
// Add a duration field to test content type.
$fieldStorage = FieldStorageConfig::create([
'field_name' => $this->fieldName,
'entity_type' => 'node',
'type' => 'ipaddress',
'settings' => [],
]);
$fieldStorage->save();
$field = FieldConfig::create([
'field_storage' => $fieldStorage,
'bundle' => $this->nodeType->id(),
'settings' => [
'allow_range' => TRUE,
'allow_family' => 4,
'ip4_range' => '',
'ip6_range' => '',
],
]);
$field->save();
// Configure the displays to make sure field is shown on node form and view.
$form = \Drupal::configFactory()
->getEditable('core.entity_form_display.node.' . $this->nodeType->id() . '.default');
$form->set('content.' . $this->fieldName . '.type', 'ipaddress_default')
->set('content.' . $this->fieldName . '.settings', [])
->set('content.' . $this->fieldName . '.third_party_settings', [])
->set('content.' . $this->fieldName . '.weight', 0)
->save();
// Configure the widget to make sure field in shown on node form.
$display = \Drupal::configFactory()
->getEditable('core.entity_view_display.node.' . $this->nodeType->id() . '.default');
$display->set('content.' . $this->fieldName . '.type', 'ipaddress_default')
->set('content.' . $this->fieldName . '.label', 'hidden')
->set('content.' . $this->fieldName . '.settings', [])
->set('content.' . $this->fieldName . '.third_party_settings', [])
->set('content.' . $this->fieldName . '.weight', 0)
->save();
}
/**
* Tests the ipaddress field with different settings and values.
*
* @param array $field_settings
* The ip field instance settings.
* @param string $value
* IP address value.
* @param string $expected
* The expected output for the field.
* @param string $error
* The expected error message.
*
* @throws \Behat\Mink\Exception\ElementNotFoundException
* @throws \Behat\Mink\Exception\ElementTextException
* @throws \Behat\Mink\Exception\ExpectationException
* @throws \Behat\Mink\Exception\ResponseTextException
* @throws \Drupal\Core\Entity\EntityStorageException
*
* @dataProvider ipAddressFieldDataProvider
*/
public function testIpAddressField(array $field_settings, string $value, string $expected = '', string $error = '') {
// Apply field settings.
$field = FieldConfig::loadByName('node', $this->nodeType->id(), $this->fieldName);
$field->set('settings', $field_settings)->save();
// Create new node of test type.
$this->drupalGet('node/add/' . $this->nodeType->id());
$this->assertSession()->statusCodeEquals(200);
$this->submitForm([
'title[0][value]' => 'Test node',
$this->fieldName . '[0][value]' => $value,
], 'Save');
if ($error) {
$this->assertSession()->pageTextContains($error);
}
elseif ($expected) {
$this->assertSession()->addressMatches('/^\/node\/\d$/');
$this->assertSession()->elementTextContains('css', 'article', $expected);
}
}
/**
* Data provider for testIpAddressField.
*/
public function ipAddressFieldDataProvider() {
return [
// Test correct single value with default settings.
[
[
'allow_range' => TRUE,
'allow_family' => 4,
'ip4_range' => '',
'ip6_range' => '',
],
'107.127.42.16',
'107.127.42.16',
],
// Test correct range value with default settings.
[
[
'allow_range' => TRUE,
'allow_family' => 4,
'ip4_range' => '',
'ip6_range' => '',
],
'107.127.42.16-117.137.62.56',
'107.127.42.16-117.137.62.56',
],
// Test incorrect value with default settings.
[
[
'allow_range' => TRUE,
'allow_family' => 4,
'ip4_range' => '',
'ip6_range' => '',
],
'107.127.42.316',
'',
'Invalid IP or range.',
],
// Test incorrect range value with default settings.
[
[
'allow_range' => TRUE,
'allow_family' => 4,
'ip4_range' => '',
'ip6_range' => '',
],
'107.127.42.16-310.124.62.56',
'',
'Invalid IP or range.',
],
// Test range value when range values are not allowed.
[
[
'allow_range' => FALSE,
'allow_family' => 4,
'ip4_range' => '',
'ip6_range' => '',
],
'107.127.42.16-117.137.62.56',
'',
'Ranges not allowed, single IP only.',
],
// Test correct value with v4 range specified.
[
[
'allow_range' => TRUE,
'allow_family' => 4,
'ip4_range' => '1.1.1.1-100.100.100.100',
'ip6_range' => '',
],
'17.27.42.16',
'17.27.42.16',
],
// Test correct range value with v4 range specified.
[
[
'allow_range' => TRUE,
'allow_family' => 4,
'ip4_range' => '1.1.1.1-100.100.100.100',
'ip6_range' => '',
],
'7.17.12.16-37.57.72.56',
'7.17.12.16-37.57.72.56',
],
// Test incorrect value with v4 range specified.
[
[
'allow_range' => TRUE,
'allow_family' => 4,
'ip4_range' => '1.1.1.1-100.100.100.100',
'ip6_range' => '',
],
'107.127.42.16',
'',
'IP must be within the range 1.1.1.1-100.100.100.100',
],
// Test incorrect range value with v4 range specified.
[
[
'allow_range' => TRUE,
'allow_family' => 4,
'ip4_range' => '1.1.1.1-100.100.100.100',
'ip6_range' => '',
],
'87.17.12.16-127.99.72.86',
'',
'IP must be within the range 1.1.1.1-100.100.100.100',
],
// Test correct value when v6 allowed.
[
[
'allow_range' => TRUE,
'allow_family' => 6,
'ip4_range' => '',
'ip6_range' => '',
],
'2001:db8:3333:4444:5555:6666:7777:8888',
'2001:db8:3333:4444:5555:6666:7777:8888',
],
// Test correct range value when v6 allowed.
[
[
'allow_range' => TRUE,
'allow_family' => 6,
'ip4_range' => '',
'ip6_range' => '',
],
'2001:db8:3333:4444:5555:6666:7777:8888-2001:db8:4444:5555:6666:7777:8888:9999',
'2001:db8:3333:4444:5555:6666:7777:8888-2001:db8:4444:5555:6666:7777:8888:9999',
],
// Test incorrect value when v6 allowed.
[
[
'allow_range' => TRUE,
'allow_family' => 6,
'ip4_range' => '',
'ip6_range' => '',
],
'2001:db8:3333:4444:5555:6666:7777:ZZZZ',
'',
'Invalid IP or range.',
],
// Test incorrect range value when v6 allowed.
[
[
'allow_range' => TRUE,
'allow_family' => 6,
'ip4_range' => '',
'ip6_range' => '',
],
'2001:db8:3333:4444:5555:6666:7777:ZZZZ-2001:db8:3333:4444:5555:6666:8888:ZZZZ',
'',
'Invalid IP or range.',
],
// Test correct value with v6 range specified.
[
[
'allow_range' => TRUE,
'allow_family' => 6,
'ip4_range' => '',
'ip6_range' => '0001:0001:0001:0001:0001:0001:0001:0001-1000:1000:1000:1000:1000:1000:1000:1000',
],
'999:999:999:999:999:999:999:999',
'999:999:999:999:999:999:999:999',
],
// Test correct range value with v6 range specified.
[
[
'allow_range' => TRUE,
'allow_family' => 6,
'ip4_range' => '',
'ip6_range' => '0001:0001:0001:0001:0001:0001:0001:0001-1000:1000:1000:1000:1000:1000:1000:1000',
],
'888:888:888:888:888:888:888:888-999:999:999:999:999:999:999:999',
'888:888:888:888:888:888:888:888-999:999:999:999:999:999:999:999',
],
// Test incorrect value with v6 range specified.
[
[
'allow_range' => TRUE,
'allow_family' => 6,
'ip4_range' => '',
'ip6_range' => '0001:0001:0001:0001:0001:0001:0001:0001-1000:1000:1000:1000:1000:1000:1000:1000',
],
'1001:1001:1001:1001:1001:1001:1001:1001',
'',
'IP must be within the range 0001:0001:0001:0001:0001:0001:0001:0001-1000:1000:1000:1000:1000:1000:1000:1000',
],
// Test incorrect range value with v6 range specified.
[
[
'allow_range' => TRUE,
'allow_family' => 6,
'ip4_range' => '',
'ip6_range' => '0001:0001:0001:0001:0001:0001:0001:0001-1000:1000:1000:1000:1000:1000:1000:1000',
],
'999:999:999:999:999:999:999:999-1001:1001:1001:1001:1001:1001:1001:1001',
'',
'IP must be within the range 0001:0001:0001:0001:0001:0001:0001:0001-1000:1000:1000:1000:1000:1000:1000:1000',
],
// Test correct v4 address when both allowed and have ranges.
[
[
'allow_range' => TRUE,
'allow_family' => 10,
'ip4_range' => '1.1.1.1-100.100.100.100',
'ip6_range' => '0001:0001:0001:0001:0001:0001:0001:0001-1000:1000:1000:1000:1000:1000:1000:1000',
],
'12.34.56.78',
'12.34.56.78',
],
// Test incorrect v4 address when both allowed and have ranges.
[
[
'allow_range' => TRUE,
'allow_family' => 10,
'ip4_range' => '1.1.1.1-100.100.100.100',
'ip6_range' => '0001:0001:0001:0001:0001:0001:0001:0001-1000:1000:1000:1000:1000:1000:1000:1000',
],
'121.34.56.78',
'',
'IP must be within the range 1.1.1.1-100.100.100.100',
],
// Test correct v6 address when both allowed and have ranges.
[
[
'allow_range' => TRUE,
'allow_family' => 10,
'ip4_range' => '1.1.1.1-100.100.100.100',
'ip6_range' => '0001:0001:0001:0001:0001:0001:0001:0001-1000:1000:1000:1000:1000:1000:1000:1000',
],
'123:123:123:123:123:123:123:123',
'123:123:123:123:123:123:123:123',
],
// Test incorrect v6 address when both allowed and have ranges.
[
[
'allow_range' => TRUE,
'allow_family' => 10,
'ip4_range' => '1.1.1.1-100.100.100.100',
'ip6_range' => '0001:0001:0001:0001:0001:0001:0001:0001-1000:1000:1000:1000:1000:1000:1000:1000',
],
'1234:123:123:123:123:123:123:123',
'',
'IP must be within the range 0001:0001:0001:0001:0001:0001:0001:0001-1000:1000:1000:1000:1000:1000:1000:1000',
],
// Test invalid data when both allowed and have ranges.
[
[
'allow_range' => TRUE,
'allow_family' => 10,
'ip4_range' => '1.1.1.1-100.100.100.100',
'ip6_range' => '0001:0001:0001:0001:0001:0001:0001:0001-1000:1000:1000:1000:1000:1000:1000:1000',
],
'INVALID DATA',
'',
'Invalid IP or range.',
],
];
}
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment