index out of rangeになったので、Validationとログを強化した refs #1

sinmetalcraft · Dec 31, 2020 · 635d17c · 635d17c
1 parent 96d6b8d
commit 635d17c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/gmail_notify_handler.go b/gmail_notify_handler.go
@@ -30,26 +30,26 @@ func GmailNotifyPubSubHandler(w http.ResponseWriter, r *http.Request) {
 	var m PubSubMessage
 	body, err := ioutil.ReadAll(r.Body)
 	if err != nil {
-		log.Printf("ioutil.ReadAll: %v", err)
+		log.Printf("ioutil.ReadAll: %v\n", err)
 		http.Error(w, "Bad Request", http.StatusBadRequest)
 		return
 	}
 	if err := json.Unmarshal(body, &m); err != nil {
-		log.Printf("json.Unmarshal: %v", err)
+		log.Printf("json.Unmarshal: %v\n", err)
 		http.Error(w, "Bad Request", http.StatusBadRequest)
 		return
 	}
 
 	var d NotifyData
 	if err := json.Unmarshal(m.Message.Data, &d); err != nil {
-		log.Printf("json.Unmarshal: %v", err)
+		log.Printf("json.Unmarshal: %v\n", err)
 		http.Error(w, "Bad Request", http.StatusBadRequest)
 		return
 	}
 
 	info, err := gmailService.GetErrorReportingInfo(ctx, d.EmailAddress, d.HistoryID, tbfErrorReportingLabelID)
 	if err != nil {
-		log.Printf("gmailService.GetErrorReportingInfo: %v", err)
+		log.Printf("gmailService.GetErrorReportingInfo: %v\n", err)
 		http.Error(w, "InternalServerError", http.StatusInternalServerError)
 		return
 	}

diff --git a/gmail_service.go b/gmail_service.go
@@ -53,6 +53,13 @@ func (s *GmailService) GetMessage(ctx context.Context, userID string, startHisto
 		return nil, fmt.Errorf("failed GmailUserService.Watch.userID=%s,req=%#v : %w", userID, err)
 	}
 
+	if len(res.History) < 1 {
+		return nil, fmt.Errorf("invalid History List. %+v", res)
+	}
+	if len(res.History[0].Messages) < 1 {
+		return nil, fmt.Errorf("invalid History Messages. %+v", res.History[0])
+	}
+
 	msg, err := s.gus.Messages.Get(userID, res.History[0].Messages[0].Id).Context(ctx).Do()
 	if err != nil {
 		return nil, fmt.Errorf("failed GmailUserService.Message.Get.userID=%s,req=%#v : %w", userID, err)
@@ -68,7 +75,7 @@ func (s *GmailService) GetErrorReportingInfo(ctx context.Context, userID string,
 	}
 
 	if len(msg.Payload.Parts) < 2 {
-		return nil, fmt.Errorf("invalid error reporting mail format")
+		return nil, fmt.Errorf("invalid error reporting mail format.%+v", msg.Payload)
 	}
 
 	var plainText []byte