Skip to content

Commit

Permalink
Merge pull request #9 from homenoc/develop
Browse files Browse the repository at this point in the history 
Support
  • Loading branch information
@yoneyan
yoneyan authored Aug 28, 2021
2 parents 251dbb3 + fae6488 commit b07f040
Show file tree
Hide file tree
Showing 3 changed files with 201 additions and 23 deletions.
38 changes: 19 additions & 19 deletions interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,25 +99,7 @@ type Etc struct {
Password string `json:"password"`
}

type InfoDetailShort struct {
IPAddress string `json:"ip_address"`
Ryakusho string `json:"ryakusho"`
Type string `json:"type"`
InfraUserKind string `json:"infra_user_kind"`
NetworkName string `json:"network_name"`
Org string `json:"org"`
OrgEn string `json:"org_en"`
AdminJPNICHandle string `json:"admin_jpnic_handle"`
AdminJPNICHandleLink string `json:"admin_jpnic_handle_link"`
TechJPNICHandle string `json:"tech_jpnic_handle"`
TechJPNICHandleLink string `json:"tech_jpnic_handle_link"`
NameServer string `json:"name_server"`
AssignDate string `json:"assign_date"`
ReturnDate string `json:"return_date"`
UpdateDate string `json:"update_date"`
}

type InfoDetailLong struct {
type InfoDetail struct {
IPAddress string `json:"ip_address"`
Ryakusho string `json:"ryakusho"`
Type string `json:"type"`
Expand All @@ -142,6 +124,24 @@ type InfoDetailLong struct {
UpdateDate string `json:"update_date"`
}

type JPNICHandleDetail struct {
IsJPNICHandle bool `json:"is_jpnic_handle"`
JPNICHandle string `json:"jpnic_handle"`
Name string `json:"name"`
NameEn string `json:"name_en"`
Email string `json:"email"`
Org string `json:"org"`
OrgEn string `json:"org_en"`
Division string `json:"division"`
DivisionEn string `json:"division_en"`
Title string `json:"title"`
TitleEn string `json:"title_en"`
Tel string `json:"tel"`
Fax string `json:"fax"`
NotifyAddress string `json:"notify_address"`
UpdateDate string `json:"update_date"`
}

type InfoIPv4 struct {
IPAddress string `json:"ip_address"`
DetailLink string `json:"detail_link"`
Expand Down
155 changes: 151 additions & 4 deletions jpnic.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"golang.org/x/text/encoding/japanese"
"golang.org/x/text/transform"
"io/ioutil"
"log"
"net/http"
"net/http/cookiejar"
"net/url"
Expand Down Expand Up @@ -419,8 +418,8 @@ func (c *Config) GetAllIPv6(searchStr string) ([]InfoIPv6, error) {
return infos, nil
}

func (c *Config) GetIPUser(userURL string) (InfoDetailLong, error) {
var info InfoDetailLong
func (c *Config) GetIPUser(userURL string) (InfoDetail, error) {
var info InfoDetail

sessionID, err := randomStr()
if err != nil {
Expand Down Expand Up @@ -512,7 +511,6 @@ func (c *Config) GetIPUser(userURL string) (InfoDetailLong, error) {
var title string
rowHtml4.Find("td").Each(func(index int, tableCell4 *goquery.Selection) {
dataStr := strings.TrimSpace(tableCell4.Text())
log.Println(dataStr)
if index == 1 {
switch title {
case "IPネットワークアドレス":
Expand Down Expand Up @@ -576,3 +574,152 @@ func (c *Config) GetIPUser(userURL string) (InfoDetailLong, error) {

return info, err
}

func (c *Config) GetJPNICHandle(handle string) (JPNICHandleDetail, error) {
var info JPNICHandleDetail

sessionID, err := randomStr()
if err != nil {
return info, err
}

cert, err := tls.LoadX509KeyPair(c.CertFilePath, c.KeyFilePath)
if err != nil {
return info, err
}

// Load CA
caCert, err := ioutil.ReadFile(c.CAFilePath)
if err != nil {
return info, err
}
caCertPool := x509.NewCertPool()
caCertPool.AppendCertsFromPEM(caCert)

tlsConfig := &tls.Config{
Certificates: []tls.Certificate{cert},
RootCAs: caCertPool,
}
tlsConfig.BuildNameToCertificate()
transport := &http.Transport{TLSClientConfig: tlsConfig}

cookies := []*http.Cookie{
{
Name: "JSESSIONID",
Value: sessionID,
},
}

urlObj, _ := url.Parse("https://iphostmaster.nic.ad.jp/")
jar, err := cookiejar.New(nil)
if err != nil {
return info, err
}

jar.SetCookies(urlObj, cookies)

client := &http.Client{Transport: transport, Jar: jar}

resp, err := client.Get("https://iphostmaster.nic.ad.jp/jpnic/certmemberlogin.do")
if err != nil {
return info, err
}
defer resp.Body.Close()

sessionID = resp.Header.Get("Set-Cookie")[11:43]

cookies = []*http.Cookie{
{
Name: "JSESSIONID",
Value: sessionID,
},
}

jar.SetCookies(urlObj, cookies)

resp, err = client.Get("https://iphostmaster.nic.ad.jp/jpnic/entryinfo_handle.do?jpnic_hdl=" + handle)
if err != nil {
return info, err
}
defer resp.Body.Close()

reader := transform.NewReader(resp.Body, japanese.ShiftJIS.NewDecoder())
bodyByte, err := ioutil.ReadAll(reader)
if err != nil {
return info, err
}

doc, err := goquery.NewDocumentFromReader(strings.NewReader(string(bodyByte)))
if err != nil {
return info, err
}

doc.Find("table").Each(func(_ int, tableHtml1 *goquery.Selection) {
tableHtml1.Find("tr").Each(func(_ int, rowHtml1 *goquery.Selection) {
rowHtml1.Find("td").Each(func(_ int, tableCell1 *goquery.Selection) {
tableCell1.Find("table").Each(func(_ int, tableHtml2 *goquery.Selection) {
tableHtml2.Find("tr").Each(func(_ int, rowHtml2 *goquery.Selection) {
rowHtml2.Find("td").Each(func(_ int, tableCell2 *goquery.Selection) {
tableCell2.Find("table").Each(func(_ int, tableHtml3 *goquery.Selection) {
tableHtml3.Find("tr").Each(func(_ int, rowHtml3 *goquery.Selection) {
var title string
rowHtml3.Find("td").Each(func(index int, tableCell3 *goquery.Selection) {
dataStr := strings.TrimSpace(tableCell3.Text())
if index == 1 {
switch title {
case "グループハンドル":
info.IsJPNICHandle = false
info.JPNICHandle = dataStr
case "グループ名":
info.Org = dataStr
case "Group Name":
info.OrgEn = dataStr
case "JPNICハンドル":
info.IsJPNICHandle = true
info.JPNICHandle = dataStr
case "氏名":
info.Org = dataStr
case "Last, First":
info.OrgEn = dataStr
case "電子メール":
info.Email = dataStr
case "電子メイル": // JPNIC側の表記ゆれのため
info.Email = dataStr
case "組織名":
info.Org = dataStr
case "Organization":
info.OrgEn = dataStr
case "部署":
info.Division = dataStr
case "Division":
info.DivisionEn = dataStr
case "肩書":
info.Title = dataStr
case "Title":
info.TitleEn = dataStr
case "電話番号":
info.Tel = dataStr
case "Fax番号":
info.Fax = dataStr
case "FAX番号": // JPNIC側の表記ゆれのため
info.Fax = dataStr
case "通知アドレス":
info.NotifyAddress = dataStr
case "最終更新":
info.UpdateDate = dataStr
}
} else {
title = dataStr
}
})
})
})
})
})
})
})
})
})

return info, err
}
31 changes: 31 additions & 0 deletions jpnic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ var searchStr = "HOMENOC"
var v4UserURL = "/jpnic/entryinfo_v4.do?netwrk_id=2020021426910"
var v6UserURL = "/jpnic/G11320.do?netwrk_id=2020021427992"

var JPNICHandle1 = "YY38053JP"
var JPNICHandle2 = "YY36773JP"

func TestGetIPv4(t *testing.T) {
con := Config{
URL: "https://iphostmaster.nic.ad.jp/jpnic/certmemberlogin.do",
Expand Down Expand Up @@ -88,3 +91,31 @@ func TestGetIPv6User(t *testing.T) {
}
t.Log(data)
}

func TestGetJPNICHandle1(t *testing.T) {
con := Config{
CertFilePath: certFilePathV6,
KeyFilePath: keyFilePathV6,
CAFilePath: caFilePath,
}

data, err := con.GetJPNICHandle(JPNICHandle1)
if err != nil {
t.Fatal(err)
}
t.Log(data)
}

func TestGetJPNICHandle2(t *testing.T) {
con := Config{
CertFilePath: certFilePathV6,
KeyFilePath: keyFilePathV6,
CAFilePath: caFilePath,
}

data, err := con.GetJPNICHandle(JPNICHandle2)
if err != nil {
t.Fatal(err)
}
t.Log(data)
}

0 comments on commit b07f040

Please sign in to comment.