From 8fc2a4df78120a65bbcafc5bc64b83f789822e43 Mon Sep 17 00:00:00 2001 From: Enoch Date: Wed, 31 Jan 2024 14:47:58 +0800 Subject: [PATCH] Update to 0.1.0 --- composer.json | 2 +- license | 202 +++++++++++++++++++++++++++++++++ readme.md | 3 +- src/resource/Dns.php | 187 +++++++++++++++--------------- src/resource/DnsController.php | 6 +- src/resource/DnsProcess.php | 2 +- 6 files changed, 306 insertions(+), 96 deletions(-) create mode 100644 license diff --git a/composer.json b/composer.json index 4480759..e9248d7 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "laysense/dns", "type": "library", - "license": "MIT", + "license": "Apache-2.0", "description": "Webman plugin laysense/dns. You can making a DNS Server with Webman now", "require": { }, diff --git a/license b/license new file mode 100644 index 0000000..65fe77e --- /dev/null +++ b/license @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [2024] [Enoch] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/readme.md b/readme.md index 06edb48..06fdfaa 100644 --- a/readme.md +++ b/readme.md @@ -22,6 +22,7 @@ Webman的DNS服务器插件，可以实现Webman启动时运行一个DNS服务 * TXT 最新版本已经增加了CNAME+A和CNAME+AAAA方式 +0.1.0版本之后，版本号跟随WorkermanDNS,同时支持Flag类型 --- @@ -99,7 +100,7 @@ class DnsController } ``` -具体的使用方式请参照 [Workerman-DNS](https://git.laysense.com/enoch/Workerman-DNS) ([Github](https://github.com/ywnsya/workerman-dns)) 下的start.php +具体的使用方式请参照 [Workerman-DNS](https://git.laysense.com/enoch/Workerman-DNS/src/branch/master/readme.md) ([Github](https://github.com/ywnsya/workerman-dns)) 下的start.php与readme.md ## 赞助(我不要脸) diff --git a/src/resource/Dns.php b/src/resource/Dns.php index 134c880..9b8f49e 100644 --- a/src/resource/Dns.php +++ b/src/resource/Dns.php @@ -10,6 +10,15 @@ namespace Workerman\Protocols; class Dns { + public static function send($response,$query,$info){ + $response=hex2bin($response); + $traffic=strlen($response); + $info=json_decode($info); + #var_dump($info); + #出流量统计 + #您也可以在此处保存$response,下一次通过raw类型实现快速缓存相应. + return $response; + } /** * 检查包的完整性 * 如果能够得到包长，则返回包的在buffer中的长度，否则返回0继续等待数据 @@ -19,8 +28,7 @@ class Dns */ public static function input($buffer) { - - return 200; + return 512; } /** @@ -34,6 +42,39 @@ class Dns $buffer=json_decode($buffer); $type=$buffer->type; switch($type){ + case 'raw': + return Dns::send($buffer->detail,$buffer->query,$buffer->info); + break; + case 'flag': + if($buffer->flag=='NXDOMAIN'){ + $status='8183'; + $questions='0001'; + $AnswerRRs='0000'; + $AuthorityRRs='0001'; + /** + * NXDOMAIN应当返回SOA记录，主要内容是TTL，LDNS会在SOA的TTL到期前缓存该FLAG，否则会被LDNS递归时拒绝 + */ + $AdditionalRRs='0000'; + $response=$buffer->id.$status.$questions.$AnswerRRs.$AuthorityRRs.$AdditionalRRs.$buffer->query; + return Dns::send($response,$buffer->query,$buffer->info); + }elseif($buffer->flag=='SERVFAIL'){ + $status='8182'; + $questions='0001'; + $AnswerRRs='0000'; + $AuthorityRRs='0000'; + $AdditionalRRs='0000'; + $response=$buffer->id.$status.$questions.$AnswerRRs.$AuthorityRRs.$AdditionalRRs.$buffer->query; + return Dns::send($response,$buffer->query,$buffer->info); + }elseif($buffer->flag=='REFUSE'){ + $status='8185'; + $questions='0001'; + $AnswerRRs='0000'; + $AuthorityRRs='0000'; + $AdditionalRRs='0000'; + $response=$buffer->id.$status.$questions.$AnswerRRs.$AuthorityRRs.$AdditionalRRs.$buffer->query; + return Dns::send($response,$buffer->query,$buffer->info); + } + break; case 'A': $type='0001'; #$lenth='0004'; @@ -150,7 +191,7 @@ class Dns $AnswerRRs=str_pad((count((array)$ip)+1),4,"0",STR_PAD_LEFT); $response=$buffer->id.$status.$questions.$AnswerRRs.$AuthorityRRs.$AdditionalRRs.$buffer->query.$answer; - return hex2bin($response); + return Dns::send($response,$buffer->query,$buffer->info); break; case 'CNAME+AAAA': @@ -201,14 +242,14 @@ class Dns $AnswerRRs=str_pad((count((array)$ip)+1),4,"0",STR_PAD_LEFT); $response=$buffer->id.$status.$questions.$AnswerRRs.$AuthorityRRs.$AdditionalRRs.$buffer->query.$answer; - return hex2bin($response); + return Dns::send($response,$buffer->query,$buffer->info); break; case 'SOA': $type='0006'; $ns=$buffer->detail; $ns=json_decode( json_encode( $ns),true); - if($ns['type']=='none'){ + if($ns['type']=='auto'){ $Rns=dns_get_record($ns['name'],DNS_SOA); $Rns=$Rns[0]; $ns=$Rns; @@ -282,24 +323,31 @@ class Dns case 'none': $type='0006'; $ns=$buffer->detail; - $url=$ns; - while(true){ - preg_match("#\.(.*)#i",$url,$match);//获取根域名 - $domin = $match[1]; - $soa=dns_get_record($domin,DNS_SOA); - if(array_key_exists('0',$soa)){ - if(array_key_exists('mname',$soa[0])){ - $qname=$domin; - $ns=$soa[0]; - break; + $ns=json_decode( json_encode( $ns),true); + var_dump($ns); + + if($ns['type']=='auto'){ + $ns=$ns['name']; + $url=$ns; + while(true){ + preg_match("#\.(.*)#i",$url,$match);//获取根域名 + $domin = $match[1]; + $soa=dns_get_record($domin,DNS_SOA); + if(array_key_exists('0',$soa)){ + if(array_key_exists('mname',$soa[0])){ + $qname=$domin; + $ns=$soa[0]; + break; + }else{ + $url=$domin; + } + }else{ + $url=$domin; + } + } }else{ - $url=$domin; + $qname=$ns['qname']; } - }else{ - $url=$domin; - } - } - $nss=explode('.',$ns['mname']); $detail=''; foreach($nss as $part){ @@ -340,7 +388,7 @@ class Dns $answer=''; $answer=$answer.$qname.$type.'0001'.$ttl.$lenth.$detail; $response=$buffer->id.$status.$questions.$AnswerRRs.$AuthorityRRs.$AdditionalRRs.$buffer->query.$answer; - return hex2bin($response); + return Dns::send($response,$buffer->query,$buffer->info); break; } $ttl=str_pad(dechex($buffer->ttl),8,"0",STR_PAD_LEFT); @@ -358,7 +406,8 @@ class Dns $answer=$answer.'C00C'.$type.'0001'.$ttl.$rlenth.$c; } $response=$buffer->id.$status.$questions.$AnswerRRs.$AuthorityRRs.$AdditionalRRs.$buffer->query.$answer; - return hex2bin($response); + $traffic=strlen(hex2bin($response)); + return Dns::send($response,$buffer->query,$buffer->info); } /** @@ -369,12 +418,27 @@ class Dns */ public static function decode($buffer) { - /** - $data=bin2hex($buffer); - echo $data; - $id=substr($data,0,4); - $flag=substr($data,5,4); - $type=substr($data,-8,4); + $traffic=strlen($buffer);#接收流量 + $data=bin2hex($buffer); + $id=substr($data,0,4); + $flag=substr($data,4,4); + $questions=substr($data,8,4); + $answerRRs=substr($data,12,4); + $authorityRRs=substr($data,16,4); + $additionalRRs=substr($data,20,4); + $startbyte=24; + $dlen=substr($data,$startbyte,2); + $startbyte=26; + $i=1; + while($dlen!='00'){ + $domain[$i]=hex2bin(substr($data,$startbyte,hexdec($dlen)*2)); + $startbyte=$startbyte+(hexdec($dlen)*2); + $dlen=substr($data,$startbyte,2); + $startbyte=$startbyte+2; + $i++; + } + $realname=join(".",$domain); + $type=substr($data,$startbyte,4); switch($type){ case '0001': $type='A'; @@ -401,71 +465,10 @@ class Dns $type='MX'; break; } - $name=substr($data,24,-8); - $namede=str_split($name,2); - $realname=''; - foreach($namede as $cha){ - $chat=hex2bin($cha); - if(!ctype_alnum($chat)){ - $chat='.'; - } - $realname=$realname.$chat; - } - $realname=substr($realname,1,-1); - $query=substr($data,24); - ***/ - - #$returndata="$type".'|||'."$realname"; - $data=bin2hex($buffer); - $id=substr($data,0,4); -$flag=substr($data,4,4); -$questions=substr($data,8,4); -$answerRRs=substr($data,12,4); -$authorityRRs=substr($data,16,4); -$additionalRRs=substr($data,20,4); -$startbyte=24; -$dlen=substr($data,$startbyte,2); -$startbyte=26; -$i=1; -while($dlen!='00'){ -$domain[$i]=hex2bin(substr($data,$startbyte,hexdec($dlen)*2)); -$startbyte=$startbyte+(hexdec($dlen)*2); -$dlen=substr($data,$startbyte,2); -$startbyte=$startbyte+2; -$i++; -} -$realname=join(".",$domain); -$type=substr($data,$startbyte,4); -switch($type){ - case '0001': - $type='A'; - break; - case '0002': - $type='NS'; - break; - case '000c': - $type='PTR'; - break; - case '0006': - $type='SOA'; - break; - case '001c': - $type='AAAA'; - break; - case '0005': - $type='CNAME'; - break; - case '0010': - $type='TEXT'; - break; - case '000f': - $type='MX'; - break; -} -$query=substr($data,24,$startbyte-16); + $query=substr($data,24,$startbyte-16); - $returndata= json_encode(array('type' => $type, 'name' => "$realname", 'id'=>"$id", 'query'=>"$query")); + $returndata= json_encode(array('type' => $type, 'name' => "$realname", 'id'=>"$id", 'query'=>"$query",'traffic'=>$traffic)); return $returndata; } diff --git a/src/resource/DnsController.php b/src/resource/DnsController.php index ae853b5..09854ac 100644 --- a/src/resource/DnsController.php +++ b/src/resource/DnsController.php @@ -10,7 +10,7 @@ use dnstools\ipv6; #用于IPv6相关 class DnsController { - public function DNS($type,$name,$rip,$id,$query) + public function DNS($type,$name,$rip,$id,$query,$traffic=0) { #输出信息 #echo "\n Type:$type \n Domain: $name\n Client IP: $rip \n"; @@ -41,6 +41,10 @@ class DnsController #此处无需修改 $send['id']=$id; $send['query']=$query; + if(!isset($send['ttl'])){ + $send['ttl']=0; + } + $send['info']=json_encode(['domain'=>$name,'querytype'=>$type,'answertype'=>$send['type'],'ip'=>$rip,'ttl'=>$send['ttl'],'detail'=>$send['detail']]); $return=json_encode($send); return $return; } diff --git a/src/resource/DnsProcess.php b/src/resource/DnsProcess.php index 3f4f2d5..5e998d4 100644 --- a/src/resource/DnsProcess.php +++ b/src/resource/DnsProcess.php @@ -17,7 +17,7 @@ class DnsProcess #echo "\n Type:$type \n Domain: $name\n Client IP: $rip \n"; $dns=new DnsController; - $return=$dns->DNS($type,$name,$rip,$data->id,$data->query); + $return=$dns->DNS($type,$name,$rip,$data->id,$data->query,$data->traffic); $connection->send($return); }