Add netrc as auth type

app/__mocks__/node-libcurl.js

@@ -79,6 +79,12 @@ Curl.auth = {
   ANY: 'ANY'
 };
 
+Curl.netrc = {
+  IGNORED: 0,
+  OPTIONAL: 1,
+  REQUIRED: 2
+};
+
 Curl.option = {
   ACCEPT_ENCODING: 'ACCEPT_ENCODING',
   CAINFO: 'CAINFO',
@@ -93,6 +99,7 @@ Curl.option = {
   HTTPPOST: 'HTTPPOST',
   INFILESIZE: 'INFILESIZE',
   KEYPASSWD: 'KEYPASSWD',
+  NETRC: 'NETRC',
   NOBODY: 'NOBODY',
   NOPROGRESS: 'NOPROGRESS',
   NOPROXY: 'NOPROXY',

app/common/constants.js

@@ -140,6 +140,7 @@ export const AUTH_DIGEST = 'digest';
 export const AUTH_BEARER = 'bearer';
 export const AUTH_NTLM = 'ntlm';
 export const AUTH_AWS_IAM = 'iam';
+export const AUTH_NETRC = 'netrc';
 
 const authTypesMap = {
   [AUTH_BASIC]: ['Basic', 'Basic Auth'],
@@ -148,7 +149,8 @@ const authTypesMap = {
   [AUTH_BEARER]: ['Bearer', 'Bearer Token'],
   [AUTH_OAUTH_1]: ['OAuth 1', 'OAuth 1.0'],
   [AUTH_OAUTH_2]: ['OAuth 2', 'OAuth 2.0'],
-  [AUTH_AWS_IAM]: ['AWS', 'AWS IAM v4']
+  [AUTH_AWS_IAM]: ['AWS', 'AWS IAM v4'],
+  [AUTH_NETRC]: ['Netrc', 'Netrc']
 };
 
 export function getPreviewModeName (previewMode, useLong = false) {

app/models/request.js

@@ -1,6 +1,6 @@
 // @flow
 import type {BaseModel} from './index';
-import {AUTH_BASIC, AUTH_DIGEST, AUTH_NONE, AUTH_NTLM, AUTH_OAUTH_2, AUTH_AWS_IAM, CONTENT_TYPE_FILE, CONTENT_TYPE_FORM_DATA, CONTENT_TYPE_FORM_URLENCODED, CONTENT_TYPE_OTHER, getContentTypeFromHeaders, METHOD_GET, CONTENT_TYPE_GRAPHQL, CONTENT_TYPE_JSON} from '../common/constants';
+import {AUTH_BASIC, AUTH_DIGEST, AUTH_NONE, AUTH_NTLM, AUTH_OAUTH_2, AUTH_AWS_IAM, AUTH_NETRC, CONTENT_TYPE_FILE, CONTENT_TYPE_FORM_DATA, CONTENT_TYPE_FORM_URLENCODED, CONTENT_TYPE_OTHER, getContentTypeFromHeaders, METHOD_GET, CONTENT_TYPE_GRAPHQL, CONTENT_TYPE_JSON} from '../common/constants';
 import * as db from '../common/database';
 import {getContentTypeHeader} from '../common/misc';
 import {buildFromParams, deconstructToParams} from '../common/querystring';
@@ -101,6 +101,7 @@ export function newAuth (type: string, oldAuth: RequestAuthentication = {}): Req
     case AUTH_OAUTH_2:
       return {type, grantType: GRANT_TYPE_AUTHORIZATION_CODE};
 
+    // Aws IAM
     case AUTH_AWS_IAM:
       return {
         type,
@@ -109,6 +110,10 @@ export function newAuth (type: string, oldAuth: RequestAuthentication = {}): Req
         secretAccessKey: oldAuth.secretAccessKey || ''
       };
 
+    // netrc
+    case AUTH_NETRC:
+      return {type};
+
     // Types needing no defaults
     default:
       return {type};

app/network/__tests__/network.test.js

@@ -2,7 +2,7 @@ import * as networkUtils from '../network';
 import {join as pathJoin, resolve as pathResolve} from 'path';
 import {getRenderedRequest} from '../../common/render';
 import * as models from '../../models';
-import {AUTH_AWS_IAM, AUTH_BASIC, CONTENT_TYPE_FILE, CONTENT_TYPE_FORM_DATA, CONTENT_TYPE_FORM_URLENCODED, getAppVersion} from '../../common/constants';
+import {AUTH_AWS_IAM, AUTH_BASIC, AUTH_NETRC, CONTENT_TYPE_FILE, CONTENT_TYPE_FORM_DATA, CONTENT_TYPE_FORM_URLENCODED, getAppVersion} from '../../common/constants';
 import {filterHeaders} from '../../common/misc';
 import {globalBeforeEach} from '../../__jest__/before-each';
 
@@ -425,6 +425,40 @@ describe('actuallySend()', () => {
       }
     });
   });
+
+  it('uses netrc', async () => {
+    const workspace = await models.workspace.create();
+    const settings = await models.settings.create();
+
+    const request = Object.assign(models.request.init(), {
+      _id: 'req_123',
+      parentId: workspace._id,
+      authentication: {
+        type: AUTH_NETRC
+      }
+    });
+
+    const renderedRequest = await getRenderedRequest(request);
+    const {bodyBuffer} = await networkUtils._actuallySend(renderedRequest, workspace, settings);
+
+    const body = JSON.parse(bodyBuffer);
+    expect(body).toEqual({
+      options: {
+        CUSTOMREQUEST: 'GET',
+        ACCEPT_ENCODING: '',
+        COOKIEFILE: '',
+        FOLLOWLOCATION: true,
+        HTTPHEADER: ['content-type: '],
+        NOPROGRESS: false,
+        PROXY: '',
+        TIMEOUT_MS: 0,
+        NETRC: 2,
+        URL: '',
+        USERAGENT: `insomnia/${getAppVersion()}`,
+        VERBOSE: true
+      }
+    });
+  });
 });
 
 describe('_getAwsAuthHeaders', () => {

app/network/network.js

@@ -15,7 +15,7 @@ import {join as pathJoin} from 'path';
 import * as models from '../models';
 import * as querystring from '../common/querystring';
 import * as util from '../common/misc.js';
-import {AUTH_AWS_IAM, AUTH_BASIC, AUTH_DIGEST, AUTH_NTLM, CONTENT_TYPE_FORM_DATA, CONTENT_TYPE_FORM_URLENCODED, getAppVersion, STATUS_CODE_PLUGIN_ERROR} from '../common/constants';
+import {AUTH_AWS_IAM, AUTH_BASIC, AUTH_DIGEST, AUTH_NETRC, AUTH_NTLM, CONTENT_TYPE_FORM_DATA, CONTENT_TYPE_FORM_URLENCODED, getAppVersion, STATUS_CODE_PLUGIN_ERROR} from '../common/constants';
 import {describeByteSize, hasAuthHeader, hasContentTypeHeader, hasUserAgentHeader, setDefaultProtocol} from '../common/misc';
 import {getRenderedRequest} from '../common/render';
 import fs from 'fs';
@@ -467,6 +467,8 @@ export function _actuallySend (
           for (const header of extraHeaders) {
             headers.push(header);
           }
+        } else if (renderedRequest.authentication.type === AUTH_NETRC) {
+          setOpt(Curl.option.NETRC, Curl.netrc.REQUIRED);
         } else {
           const authHeader = await getAuthHeader(
             renderedRequest._id,

app/ui/components/dropdowns/auth-dropdown.js

@@ -5,7 +5,7 @@ import {trackEvent} from '../../../analytics';
 import {showModal} from '../modals';
 import AlertModal from '../modals/alert-modal';
 import * as models from '../../../models';
-import {AUTH_BASIC, AUTH_DIGEST, AUTH_BEARER, AUTH_NONE, AUTH_NTLM, AUTH_OAUTH_1, AUTH_OAUTH_2, AUTH_AWS_IAM, getAuthTypeName} from '../../../common/constants';
+import {AUTH_BASIC, AUTH_DIGEST, AUTH_BEARER, AUTH_NONE, AUTH_NTLM, AUTH_OAUTH_1, AUTH_OAUTH_2, AUTH_AWS_IAM, AUTH_NETRC, getAuthTypeName} from '../../../common/constants';
 
 @autobind
 class AuthDropdown extends PureComponent {
@@ -68,6 +68,7 @@ class AuthDropdown extends PureComponent {
         {this.renderAuthType(AUTH_BEARER)}
         {this.renderAuthType(AUTH_NTLM)}
         {this.renderAuthType(AUTH_AWS_IAM)}
+        {this.renderAuthType(AUTH_NETRC)}
         <DropdownDivider>Other</DropdownDivider>
         {this.renderAuthType(AUTH_NONE, 'No Authentication')}
       </Dropdown>

app/ui/components/editors/auth/auth-wrapper.js

@@ -1,11 +1,12 @@
 import React, {PropTypes, PureComponent} from 'react';
-import {AUTH_BASIC, AUTH_DIGEST, AUTH_BEARER, AUTH_NTLM, AUTH_OAUTH_1, AUTH_OAUTH_2, AUTH_AWS_IAM} from '../../../../common/constants';
+import {AUTH_BASIC, AUTH_DIGEST, AUTH_BEARER, AUTH_NTLM, AUTH_OAUTH_1, AUTH_OAUTH_2, AUTH_AWS_IAM, AUTH_NETRC} from '../../../../common/constants';
 import BasicAuth from './basic-auth';
 import DigestAuth from './digest-auth';
 import BearerAuth from './bearer-auth';
 import NTLMAuth from './ntlm-auth';
-import OAuth2 from './o-auth-2';
+import OAuth2Auth from './o-auth-2-auth';
 import AWSAuth from './aws-auth';
+import NetrcAuth from './netrc-auth';
 import autobind from 'autobind-decorator';
 import Link from '../../base/link';
 
@@ -37,7 +38,7 @@ class AuthWrapper extends PureComponent {
       );
     } else if (authentication.type === AUTH_OAUTH_2) {
       return (
-        <OAuth2
+        <OAuth2Auth
           oAuth2Token={oAuth2Token}
           request={request}
           handleRender={handleRender}
@@ -104,6 +105,10 @@ class AuthWrapper extends PureComponent {
           showPasswords={showPasswords}
         />
       );
+    } else if (authentication.type === AUTH_NETRC) {
+      return (
+        <NetrcAuth />
+      );
     } else {
       return (
         <div className="vertically-center text-center">

app/ui/components/editors/auth/netrc-auth.js

@@ -0,0 +1,16 @@
+import React, {PureComponent} from 'react';
+
+class NetrcAuth extends PureComponent {
+  render () {
+    return (
+      <div className="vertically-center text-center">
+        <p className="pad super-faint text-sm text-center">
+          <br/>
+          Your netrc file will be used to authenticate this request
+        </p>
+    </div>
+    );
+  }
+}
+
+export default NetrcAuth;

app/ui/components/editors/auth/o-auth-2.js → app/ui/components/editors/auth/o-auth-2-auth.js

@@ -20,7 +20,7 @@ const getAuthorizationUrls = () => authorizationUrls;
 const getAccessTokenUrls = () => accessTokenUrls;
 
 @autobind
-class OAuth2 extends React.PureComponent {
+class OAuth2Auth extends React.PureComponent {
   props: {
     handleRender: Function,
     handleGetRenderContext: Function,
@@ -433,4 +433,4 @@ class OAuth2 extends React.PureComponent {
   }
 }
 
-export default OAuth2;
+export default OAuth2Auth;

flow-typed/node-libcurl.js

@@ -14,6 +14,7 @@ declare class Curl {
     HTTPPOST: number,
     INFILESIZE: number,
     KEYPASSWD: number,
+    NETRC: number,
     NOBODY: number,
     NOPROGRESS: number,
     NOPROXY: number,
@@ -49,6 +50,12 @@ declare class Curl {
     CURLE_ABORTED_BY_CALLBACK: string
   };
 
+  static netrc: {
+    IGNORED: number,
+    OPTIONAL: number,
+    REQUIRED: number,
+  };
+
   static info: {
     EFFECTIVE_URL: string,
     SIZE_DOWNLOAD: string,