Skip to content

Commit fbeb11d

Browse files
author
Florian Schaal
committed
re-add rewrite ipv6 on mirror - lost in conversion from SVN to git
1 parent d6742cf commit fbeb11d

File tree

5 files changed

+52
-28
lines changed

5 files changed

+52
-28
lines changed

‎interface/lib/classes/tform_base.inc.php‎

Lines changed: 38 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -941,37 +941,54 @@ function validateField($field_name, $field_value, $validators) {
941941
}
942942
}
943943
break;
944+
case 'V6PREFIXEND':
945+
$explode_field_value = explode(':',$field_value);
946+
// if ($explode_field_value[count($explode_field_value)-1]=='' && $explode_field_value[count($explode_field_value)-2]=='' ){ }
947+
if (!$explode_field_value[count($explode_field_value)-1]=='' && $explode_field_value[count($explode_field_value)-2]!='' ) {
948+
$errmsg = $validator['errmsg'];
949+
if(isset($this->wordbook[$errmsg])) {
950+
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
951+
} else {
952+
$this->errorMessage .= $errmsg."<br />\r\n";
953+
}
954+
}
955+
break;
956+
case 'V6PREFIXLENGTH':
957+
// find shortes ipv6 subnet can`t be longer
958+
$sql_v6 = $app->db->queryOneRecord("SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND virtualhost = 'y' ORDER BY CHAR_LENGTH(ip_address) ASC LIMIT 0,1;");
959+
$sql_v6_explode=explode(':',$sql_v6['ip_address']);
960+
$explode_field_value = explode(':',$field_value);
961+
if (count($sql_v6_explode) < count($explode_field_value) && isset($sql_v6['ip_address'])) {
962+
$errmsg = $validator['errmsg'];
963+
if(isset($this->wordbook[$errmsg])) {
964+
$this->errorMessage .= $this->wordbook[$errmsg].$sql_v6[ip_address]."<br />\r\n";
965+
} else {
966+
$this->errorMessage .= $errmsg."<br />\r\n";
967+
}
968+
}
969+
break;
944970
case 'ISV6PREFIX':
945-
$v6_prefix_ok = 0;
946-
$explode_field_value = explode(':', $field_value);
971+
$v6_prefix_ok=0;
972+
$explode_field_value = explode(':',$field_value);
947973
if ($explode_field_value[count($explode_field_value)-1]=='' && $explode_field_value[count($explode_field_value)-2]=='' ){
948974
if ( count($explode_field_value) <= 9 ) {
949-
if(filter_var(substr($field_value, 0, strlen($field_value)-2), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) or filter_var(substr($field_value, 0, strlen($field_value)-2).'::0', FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) or filter_var(substr($field_value, 0, strlen($field_value)-2).':0', FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) ) {
975+
if (filter_var(substr($field_value,0,strlen($field_value)-2),FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) or filter_var(substr($field_value,0,strlen($field_value)-2).'::0',FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) or filter_var(substr($field_value,0,strlen($field_value)-2).':0',FILTER_VALIDATE_IP,FILTER_FLAG_IPV6) ) {
950976
$v6_prefix_ok = 1;
951977
}
952978
}
953-
} else {
954-
$v6_prefix_ok = 2;
955979
}
956-
// check subnet against defined server-ipv6
957-
$sql_v6 = $app->db->queryOneRecord("SELECT ip_address FROM server_ip WHERE ip_type = 'IPv6' AND virtualhost = 'y' LIMIT 0,1");
958-
$sql_v6_explode=explode(':', $sql_v6['ip_address']);
959-
if ( count($sql_v6_explode) < count($explode_field_value) && isset($sql_v6['ip_address']) ) {
960-
$v6_prefix_ok = 3;
961-
}
962-
if($v6_prefix_ok == 0) {
980+
if($v6_prefix_ok <> 1) {
963981
$errmsg = $validator['errmsg'];
964-
}
965-
if($v6_prefix_ok == 2) {
966-
$errmsg = 'IPv6 Prefix must end with ::';
967-
}
968-
if($v6_prefix_ok == 3) {
969-
$errmsg = 'IPv6 Prefix too long (according to Server IP Addresses)';
970-
}
971-
if($v6_prefix_ok <> 1){
972-
$this->errorMessage .= $errmsg."<br />\r\n";
982+
if(isset($this->wordbook[$errmsg])) {
983+
$this->errorMessage .= $this->wordbook[$errmsg]."<br />\r\n";
984+
} else {
985+
$this->errorMessage .= $errmsg."<br />\r\n";
986+
}
973987
}
974988
break;
989+
990+
991+
975992
case 'ISIPV4':
976993
$vip=1;
977994
if(preg_match("/^[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}(\.)[0-9]{1,3}$/", $field_value)){

‎interface/web/admin/form/server_config.tform.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,12 @@
8989
'v6_prefix' => array(
9090
'datatype' => 'VARCHAR',
9191
'formtype' => 'TEXT',
92-
'validators' => array(0 => array('type' => 'ISV6PREFIX',
93-
'errmsg' => 'v6_prefix_wrong'),
92+
'validators' => array( 0 => array('type' => 'ISV6PREFIX',
93+
'errmsg' => 'v6_prefix_wrong'),
94+
1 => array('type' => 'V6PREFIXEND',
95+
'errmsg' => 'v6_prefix_end'),
96+
2 => array('type' => 'V6PREFIXLENGTH',
97+
'errmsg' => 'v6_prefix_length')
9498
),
9599
'default' => ''
96100
),

‎interface/web/admin/lib/lang/en_server_config.lng‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,4 +191,7 @@ $wb['munin_user_txt'] = 'Munin User';
191191
$wb['munin_password_txt'] = 'Munin Password';
192192
$wb['munin_url_error_regex'] = 'Invalid Munin URL';
193193
$wb['munin_url_note_txt'] = 'Placeholder:';
194+
$wb["v6_prefix_txt"] = 'IPv6 Prefix';
195+
$wb["vhost_rewrite_v6_txt"] = 'Rewrite IPv6 on Mirror';
196+
$wb["v6_prefix_length"] = 'Prefix too long according to defined IPv6 ';
194197
?>

‎interface/web/admin/templates/server_config_web_edit.htm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,12 @@ <h2><tmpl_var name="list_head_txt"></h2>
3535
<label for="website_autoalias">{tmpl_var name='website_autoalias_txt'}</label>
3636
<input name="website_autoalias" id="website_autoalias" value="{tmpl_var name='website_autoalias'}" size="40" maxlength="255" type="text" class="textInput" />&nbsp;{tmpl_var name='website_autoalias_note_txt'} <a href="javascript:void(0);" class="addPlaceholder">[client_id]</a>, <a href="javascript:void(0);" class="addPlaceholder">[client_username]</a>, <a href="javascript:void(0);" class="addPlaceholder">[website_id]</a>, <a href="javascript:void(0);" class="addPlaceholder">[website_domain]</a>
3737
</div>
38-
<!--
3938
<div class="ctrlHolder apache">
4039
<label for="vhost_rewrite_v6">{tmpl_var name='vhost_rewrite_v6_txt'}</label>
4140
<div class="multiField">
4241
{tmpl_var name='vhost_rewrite_v6'}
4342
</div>
4443
</div>
45-
-->
4644
<div class="ctrlHolder apache">
4745
<label for="vhost_conf_dir">{tmpl_var name='vhost_conf_dir_txt'}</label>
4846
<input name="vhost_conf_dir" id="vhost_conf_dir" value="{tmpl_var name='vhost_conf_dir'}" size="40" maxlength="255" type="text" class="textInput" />

‎server/plugins-available/apache2_plugin.inc.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,9 +1435,11 @@ function update($event_name, $data) {
14351435

14361436
//* Add vhost for IPv6 IP
14371437
if($data['new']['ipv6_address'] != '') {
1438-
if ($conf['serverconfig']['web']['vhost_rewrite_v6'] == 'y') {
1439-
if (isset($conf['serverconfig']['server']['v6_prefix']) && $conf['serverconfig']['server']['v6_prefix'] <> '') {
1440-
$explode_v6prefix=explode(':', $conf['serverconfig']['server']['v6_prefix']);
1438+
//* rewrite ipv6 on mirrors
1439+
/* chang $conf to $web_config */
1440+
if ($web_config['serverconfig']['web']['vhost_rewrite_v6'] == 'y') {
1441+
if (isset($web_config['serverconfig']['server']['v6_prefix']) && $web_config['serverconfig']['server']['v6_prefix'] <> '') {
1442+
$explode_v6prefix=explode(':', $web_config['serverconfig']['server']['v6_prefix']);
14411443
$explode_v6=explode(':', $data['new']['ipv6_address']);
14421444

14431445
for ( $i = 0; $i <= count($explode_v6prefix)-3; $i++ ) {

0 commit comments

Comments
 (0)