Skip to content

Commit f3a14a7

Browse files
shollenbeckshollenbeck
committed
Merge branch 'develop'
2 parents 8f60c4d + 0bd242d commit f3a14a7

File tree

131 files changed

+1513
-236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+1513
-236
lines changed

‎ChangeLog

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
* 2015-11-20: Version 0.10.0
2+
* Updated for compatibility with getdns 0.5.1.
3+
* Added php_getdns_context_get_tls_authentication()
4+
* Added php_getdns_context_get_tls_query_padding_blocksize()
5+
* Added php_getdns_context_set_tls_query_padding_blocksize()
6+
* Added php_getdns_context_get_edns_client_subnet_private()
7+
* Added php_getdns_context_set_edns_client_subnet_private()
8+
* Added constants GETDNS_CONTEXT_CODE_EDNS_CLIENT_SUBNET_PRIVATE,
9+
GETDNS_CONTEXT_CODE_EDNS_CLIENT_SUBNET_PRIVATE_TEXT,
10+
GETDNS_CONTEXT_CODE_TLS_QUERY_PADDING_BLOCKSIZE, and
11+
GETDNS_CONTEXT_CODE_TLS_QUERY_PADDING_BLOCKSIZE_TEXT.
12+
113
* 2015-10-31: Version 0.9.0
214
* Updated for compatibility with getdns 0.5.0.
315
* Added GETDNS_RETURN_NOT_IMPLEMENTED and

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
getdns-php
22
==========
33

4-
A PHP language binding for the getdns API, version 0.9.0.
4+
A PHP language binding for the getdns API, version 0.10.0.
55
This implementation is licensed under the New BSD License (BSD-new).
66

77
NOTE: THIS IS A BETA RELEASE!

‎doc-in/constants.xml

+41-1
Original file line numberDiff line numberDiff line change
@@ -1026,7 +1026,27 @@
10261026
</simpara>
10271027
</listitem>
10281028
</varlistentry>
1029-
<varlistentry xml:id="constant.getdns-context-idle-timeout">
1029+
<varlistentry xml:id="constant.getdns-context-code-edns-client-subnet-private">
1030+
<term>
1031+
<constant>GETDNS_CONTEXT_CODE_EDNS_CLIENT_SUBNET_PRIVATE</constant>
1032+
(<type>integer</type>)
1033+
</term>
1034+
<listitem>
1035+
<simpara>
1036+
</simpara>
1037+
</listitem>
1038+
</varlistentry>
1039+
<varlistentry xml:id="constant.getdns-context-code-edns-client-subnet-private-text">
1040+
<term>
1041+
<constant>GETDNS_CONTEXT_CODE_EDNS_CLIENT_SUBNET_PRIVATE_TEXT</constant>
1042+
(<type>string</type>)
1043+
</term>
1044+
<listitem>
1045+
<simpara>
1046+
</simpara>
1047+
</listitem>
1048+
</varlistentry>
1049+
<varlistentry xml:id="constant.getdns-context-code-idle-timeout">
10301050
<term>
10311051
<constant>GETDNS_CONTEXT_CODE_IDLE_TIMEOUT</constant>
10321052
(<type>integer</type>)
@@ -1126,6 +1146,26 @@
11261146
</simpara>
11271147
</listitem>
11281148
</varlistentry>
1149+
<varlistentry xml:id="constant.getdns-context-code-tls-query-padding-blocksize">
1150+
<term>
1151+
<constant>GETDNS_CONTEXT_CODE_TLS_QUERY_PADDING_BLOCKSIZE</constant>
1152+
(<type>integer</type>)
1153+
</term>
1154+
<listitem>
1155+
<simpara>
1156+
</simpara>
1157+
</listitem>
1158+
</varlistentry>
1159+
<varlistentry xml:id="constant.getdns-context-code-tls-query-padding-blocksize-text">
1160+
<term>
1161+
<constant>GETDNS_CONTEXT_CODE_TLS_QUERY_PADDING_BLOCKSIZE_TEXT</constant>
1162+
(<type>string</type>)
1163+
</term>
1164+
<listitem>
1165+
<simpara>
1166+
</simpara>
1167+
</listitem>
1168+
</varlistentry>
11291169
<varlistentry xml:id="constant.getdns-context-code-upstream-recursive-servers">
11301170
<term>
11311171
<constant>GETDNS_CONTEXT_CODE_UPSTREAM_RECURSIVE_SERVERS</constant>

‎doc-in/entities.functions.xml

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
&reference.getdns.functions.php-getdns-context-get-dns-transport;
1111
&reference.getdns.functions.php-getdns-context-get-dnssec-allowed-skew;
1212
&reference.getdns.functions.php-getdns-context-get-dnssec-trust-anchors;
13+
&reference.getdns.functions.php-getdns-context-get-edns-client-subnet-private;
1314
&reference.getdns.functions.php-getdns-context-get-edns-do-bit;
1415
&reference.getdns.functions.php-getdns-context-get-edns-extended-rcode;
1516
&reference.getdns.functions.php-getdns-context-get-edns-maximum-udp-payload-size;
@@ -21,6 +22,8 @@
2122
&reference.getdns.functions.php-getdns-context-get-resolution-type;
2223
&reference.getdns.functions.php-getdns-context-get-suffix;
2324
&reference.getdns.functions.php-getdns-context-get-timeout;
25+
&reference.getdns.functions.php-getdns-context-get-tls-authentication;
26+
&reference.getdns.functions.php-getdns-context-get-tls-query-padding-blocksize;
2427
&reference.getdns.functions.php-getdns-context-get-update-callback;
2528
&reference.getdns.functions.php-getdns-context-get-upstream-recursive-servers;
2629
&reference.getdns.functions.php-getdns-context-process-async;
@@ -31,6 +34,7 @@
3134
&reference.getdns.functions.php-getdns-context-set-dns-transport;
3235
&reference.getdns.functions.php-getdns-context-set-dnssec-allowed-skew;
3336
&reference.getdns.functions.php-getdns-context-set-dnssec-trust-anchors;
37+
&reference.getdns.functions.php-getdns-context-set-edns-client-subnet-private;
3438
&reference.getdns.functions.php-getdns-context-set-edns-do-bit;
3539
&reference.getdns.functions.php-getdns-context-set-edns-extended-rcode;
3640
&reference.getdns.functions.php-getdns-context-set-edns-maximum-udp-payload-size;
@@ -44,6 +48,7 @@
4448
&reference.getdns.functions.php-getdns-context-set-suffix;
4549
&reference.getdns.functions.php-getdns-context-set-timeout;
4650
&reference.getdns.functions.php-getdns-context-set-tls-authentication;
51+
&reference.getdns.functions.php-getdns-context-set-tls-query-padding-blocksize;
4752
&reference.getdns.functions.php-getdns-context-set-update-callback;
4853
&reference.getdns.functions.php-getdns-context-set-upstream-recursive-servers;
4954
&reference.getdns.functions.php-getdns-context-set-use-threads;

‎doc-in/functions/php-getdns-context-get-edns-client-subnet-private.xml

+75
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- $Revision$ -->
3+
4+
<refentry xml:id="function.php-getdns-context-get-edns-client-subnet-private" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
5+
<refnamediv>
6+
<refname>php_getdns_context_get_edns_client_subnet_private</refname>
7+
<refpurpose>Get the EDNS client subnet private value.</refpurpose>
8+
</refnamediv>
9+
10+
<refsect1 role="description">
11+
&reftitle.description;
12+
<methodsynopsis>
13+
<type>int</type><methodname>php_getdns_context_get_edns_client_subnet_private</methodname>
14+
<methodparam><type>int</type><parameter>context</parameter></methodparam>
15+
<methodparam><type>bool</type><parameter>value</parameter></methodparam>
16+
</methodsynopsis>
17+
<para>
18+
This function can be used to retrieve the current setting of the value used to ask
19+
EDNS client subnet aware upstreams to not reveal the originating network of the query.
20+
</para>
21+
</refsect1>
22+
23+
<refsect1 role="parameters">
24+
&reftitle.parameters;
25+
<variablelist>
26+
<varlistentry>
27+
<term><parameter>context</parameter></term>
28+
<listitem>
29+
<para>
30+
The previously created DNS context that is to be used with this request.
31+
</para>
32+
</listitem>
33+
</varlistentry>
34+
<varlistentry>
35+
<term><parameter>value</parameter></term>
36+
<listitem>
37+
<para>
38+
The current value of the subnet privacy value. It will evaluate to either TRUE or FALSE.
39+
Note that this argument is passed by reference and any existing value will be overwritten.
40+
</para>
41+
</listitem>
42+
</varlistentry>
43+
</variablelist>
44+
</refsect1>
45+
46+
<refsect1 role="returnvalues">
47+
&reftitle.returnvalues;
48+
<para>
49+
This function returns an integer response code. GETDNS_RETURN_GOOD indicates successful completion.
50+
</para>
51+
</refsect1>
52+
53+
54+
</refentry>
55+
56+
<!-- Keep this comment at the end of the file
57+
Local variables:
58+
mode: sgml
59+
sgml-omittag:t
60+
sgml-shorttag:t
61+
sgml-minimize-attributes:nil
62+
sgml-always-quote-attributes:t
63+
sgml-indent-step:1
64+
sgml-indent-data:t
65+
indent-tabs-mode:nil
66+
sgml-parent-document:nil
67+
sgml-default-dtd-file:"~/.phpdoc/manual.ced"
68+
sgml-exposed-tags:nil
69+
sgml-local-catalogs:nil
70+
sgml-local-ecat-files:nil
71+
End:
72+
vim600: syn=xml fen fdm=syntax fdl=2 si
73+
vim: et tw=78 syn=sgml
74+
vi: ts=1 sw=1
75+
-->

‎doc-in/functions/php-getdns-context-get-tls-authentication.xml

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- $Revision$ -->
3+
4+
<refentry xml:id="function.php-getdns-context-get-tls-authentication" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
5+
<refnamediv>
6+
<refname>php_getdns_context_get_tls_authentication</refname>
7+
<refpurpose>Get the TLS server authentication mode.</refpurpose>
8+
</refnamediv>
9+
10+
<refsect1 role="description">
11+
&reftitle.description;
12+
<methodsynopsis>
13+
<type>int</type><methodname>php_getdns_context_get_tls_authentication</methodname>
14+
<methodparam><type>int</type><parameter>context</parameter></methodparam>
15+
<methodparam><type>int</type><parameter>value</parameter></methodparam>
16+
</methodsynopsis>
17+
<para>
18+
This function can be used to get the mode for upstream server hostname
19+
authentication for TLS connections in stub mode. The stub resolver can
20+
require that a server provide a valid certificate (validated using the
21+
default CA repository) and that the hostname specified in the
22+
"tls_auth_name" field of the upstream dictionary matches the name in
23+
the certificate. The authentication setting is only enforced when the
24+
transport list contains only GETDNS_TRANSPORT_TLS, and in this case if
25+
authentication fails for all upstreams, queries will fail. If the
26+
transport list contains other clear text transports then opportunistic
27+
TLS will be performed which does not require authentication of the TLS
28+
connection.
29+
</para>
30+
</refsect1>
31+
32+
<refsect1 role="parameters">
33+
&reftitle.parameters;
34+
<variablelist>
35+
<varlistentry>
36+
<term><parameter>context</parameter></term>
37+
<listitem>
38+
<para>
39+
The previously created DNS context that is to be used with this request.
40+
</para>
41+
</listitem>
42+
</varlistentry>
43+
<varlistentry>
44+
<term><parameter>value</parameter></term>
45+
<listitem>
46+
<para>
47+
The value to be retrieved. It will be either GETDNS_AUTHENTICATION_NONE
48+
(the default) or GETDNS_AUTHENTICATION_HOSTNAME to indicate that host
49+
name validation is set.
50+
</para>
51+
</listitem>
52+
</varlistentry>
53+
</variablelist>
54+
</refsect1>
55+
56+
<refsect1 role="returnvalues">
57+
&reftitle.returnvalues;
58+
<para>
59+
This function returns an integer response code. GETDNS_RETURN_GOOD indicates successful completion.
60+
</para>
61+
</refsect1>
62+
63+
64+
</refentry>
65+
66+
<!-- Keep this comment at the end of the file
67+
Local variables:
68+
mode: sgml
69+
sgml-omittag:t
70+
sgml-shorttag:t
71+
sgml-minimize-attributes:nil
72+
sgml-always-quote-attributes:t
73+
sgml-indent-step:1
74+
sgml-indent-data:t
75+
indent-tabs-mode:nil
76+
sgml-parent-document:nil
77+
sgml-default-dtd-file:"~/.phpdoc/manual.ced"
78+
sgml-exposed-tags:nil
79+
sgml-local-catalogs:nil
80+
sgml-local-ecat-files:nil
81+
End:
82+
vim600: syn=xml fen fdm=syntax fdl=2 si
83+
vim: et tw=78 syn=sgml
84+
vi: ts=1 sw=1
85+
-->

‎doc-in/functions/php-getdns-context-get-tls-query-padding-blocksize.xml

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- $Revision$ -->
3+
4+
<refentry xml:id="function.php-getdns-context-get-tls-query-padding-blocksize" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
5+
<refnamediv>
6+
<refname>php_getdns_context_get_tls_query_padding_blocksize</refname>
7+
<refpurpose>Get the TLS query padding block size.</refpurpose>
8+
</refnamediv>
9+
10+
<refsect1 role="description">
11+
&reftitle.description;
12+
<methodsynopsis>
13+
<type>int</type><methodname>php_getdns_context_get_tls_query_padding_blocksize</methodname>
14+
<methodparam><type>int</type><parameter>context</parameter></methodparam>
15+
<methodparam><type>int</type><parameter>value</parameter></methodparam>
16+
</methodsynopsis>
17+
<para>
18+
This function can be used to get the value of the EDNS(0) block size padding option. With this
19+
option, the query size will be padded to be a multiple of a block size when queried
20+
over GETDNS_TRANSPORT_TLS transport. This is designed to reduce the possibility of
21+
guessing the query by analyzing query sizes.
22+
</para>
23+
</refsect1>
24+
25+
<refsect1 role="parameters">
26+
&reftitle.parameters;
27+
<variablelist>
28+
<varlistentry>
29+
<term><parameter>context</parameter></term>
30+
<listitem>
31+
<para>
32+
The previously created DNS context that is to be used with this request.
33+
</para>
34+
</listitem>
35+
</varlistentry>
36+
<varlistentry>
37+
<term><parameter>value</parameter></term>
38+
<listitem>
39+
<para>
40+
The value of the block size. Valid values range from 0 (zero) to MAXIMUM_UPSTREAM_OPTION_SPACE - 4.
41+
The value of MAXIMUM_UPSTREAM_OPTION_SPACE is a getdns library configuration parameter.
42+
</para>
43+
</listitem>
44+
</varlistentry>
45+
</variablelist>
46+
</refsect1>
47+
48+
<refsect1 role="returnvalues">
49+
&reftitle.returnvalues;
50+
<para>
51+
This function returns an integer response code. GETDNS_RETURN_GOOD indicates successful completion.
52+
</para>
53+
</refsect1>
54+
55+
56+
</refentry>
57+
58+
<!-- Keep this comment at the end of the file
59+
Local variables:
60+
mode: sgml
61+
sgml-omittag:t
62+
sgml-shorttag:t
63+
sgml-minimize-attributes:nil
64+
sgml-always-quote-attributes:t
65+
sgml-indent-step:1
66+
sgml-indent-data:t
67+
indent-tabs-mode:nil
68+
sgml-parent-document:nil
69+
sgml-default-dtd-file:"~/.phpdoc/manual.ced"
70+
sgml-exposed-tags:nil
71+
sgml-local-catalogs:nil
72+
sgml-local-ecat-files:nil
73+
End:
74+
vim600: syn=xml fen fdm=syntax fdl=2 si
75+
vim: et tw=78 syn=sgml
76+
vi: ts=1 sw=1
77+
-->

0 commit comments

Comments
 (0)