- Timestamp:
- 2008-10-31T14:23:48+13:00 (15 years ago)
- Location:
- gli/trunk/src/org/greenstone/gatherer
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/src/org/greenstone/gatherer/GAuthenticator.java
r17621 r17651 91 91 protected PasswordAuthentication getPasswordAuthentication(String username_str, String password_str) { 92 92 if(operationMode == DOWNLOAD) { // special handling of proxy authentication popup for Wget downloads 93 93 94 94 // Don't prompt if the details were already saved for the same host and port. This is necessary 95 95 // when running wget because wget requires proxy authentication. And without the following, the … … 107 107 password_str = value.substring(value.indexOf("@") + 1); 108 108 } 109 operationMode = REGULAR; // reset the state of the Authenticator to normal mode 109 110 return new PasswordAuthentication(username_str, password_str.toCharArray()); 110 111 } -
gli/trunk/src/org/greenstone/gatherer/gui/DownloadPane.java
r17621 r17651 636 636 // Only for wget, need to avoid a second automatic authentication popup (first asks 637 637 // the proxy authentication for wget, and the second will ask the same for the realm) 638 // Once the authentication has been reused, it will set the GAuthenticator state back to REGULAR 638 639 GAuthenticator.setMode(GAuthenticator.DOWNLOAD); 639 640 while(count < 3 && (user_pass = (String) GAuthenticator.authentications.get(address)) == null) { … … 641 642 count++; 642 643 } 643 GAuthenticator.setMode(GAuthenticator.REGULAR); // reset the state to default (of how the authentication popup functions)644 644 if(count >= 3) { 645 645 return false; … … 648 648 if(user_pass.indexOf("@") != -1) { 649 649 650 // Write the use proxy command - we don't do this anymore, instead we set environment variables - hopefully these can't be spied on like the foll woing can (using ps) - actually the environment stuff didn't work for windows, so lets go back to this650 // Write the use proxy command - we don't do this anymore, instead we set environment variables - hopefully these can't be spied on like the following can (using ps) - actually the environment stuff didn't work for windows, so lets go back to this 651 651 if (Utility.isWindows()) { 652 652 … … 676 676 677 677 } 678 678 679 679 return true; 680 680 } … … 684 684 685 685 } 686 686 687 687 return true; 688 688 }
Note:
See TracChangeset
for help on using the changeset viewer.