Merge pull request #9 from uploadcare/fix/no-fileinfo-panic

Fix panic when reading FileInfo from response

upload/fromurl.go

@@ -234,20 +234,46 @@ func (d *fromURLData) wait() {
 				data,
 			)
 
-			if data.Status == uploadStatusError {
-				if len(d.err) < cap(d.err) {
-					d.err <- errors.New(data.Error)
+			switch data.Status {
+			case uploadStatusSuccess:
+				if data == nil || data.FileInfo == nil {
+					err := fmt.Errorf(
+						"no data received: %+v",
+						data,
+					)
+					log.Error(err)
+					if len(d.err) < cap(d.err) {
+						d.err <- err
+					}
+					return
 				}
+				d.done <- *data.FileInfo
 				return
-			}
-			if data.Status == uploadStatusInProgress {
+			case uploadStatusInProgress:
 				if len(d.progress) < cap(d.progress) {
 					d.progress <- data.Done
 				}
-				continue
+			case uploadStatusError:
+				if len(d.err) < cap(d.err) {
+					d.err <- errors.New(data.Error)
+				}
+				return
+			case uploadStatusWaiting:
+				log.Debugf(
+					"received status: %s, waiting",
+					data.Status,
+				)
+			default:
+				err := fmt.Sprintf(
+					"received status: %s, aborting",
+					data.Status,
+				)
+				log.Error(err)
+				if len(d.err) < cap(d.err) {
+					d.err <- errors.New(err)
+				}
+				return
 			}
-			d.done <- *data.FileInfo
-			return
 		}
 	}
 }

upload/service.go

@@ -50,7 +50,7 @@ const (
 	URLDuplicatesTrue  = "1"
 	URLDuplicatesFalse = "0"
 
-	uploadStatuSuccess     = "success"
+	uploadStatusSuccess    = "success"
 	uploadStatusInProgress = "progress"
 	uploadStatusError      = "error"
 	uploadStatusWaiting    = "waiting"