/[winpt]/trunk/Src/wptKeyserverDlg.cpp
ViewVC logotype

Diff of /trunk/Src/wptKeyserverDlg.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 187 by twoaday, Wed Mar 22 11:04:20 2006 UTC revision 217 by twoaday, Mon May 22 14:21:39 2006 UTC
# Line 36  Line 36 
36  #include "wptVersion.h"  #include "wptVersion.h"
37  #include "wptGPG.h"  #include "wptGPG.h"
38  #include "wptGPGME.h"  #include "wptGPGME.h"
 #include "wptKeyManager.h"  
39  #include "wptContext.h" /* for passphrase_s */  #include "wptContext.h" /* for passphrase_s */
40    #include "wptKeyManager.h"
41  #include "wptDlgs.h"  #include "wptDlgs.h"
42  #include "wptUTF8.h"  #include "wptUTF8.h"
43    
 #define MAX_KEYSIZE 70000  
44    
45  char* get_reg_entry_keyserver (const char *);  char* get_reg_entry_keyserver (const char *);
46  int set_reg_entry_keyserver (const char *, const char *);  int set_reg_entry_keyserver (const char *, const char *);
47    
48  enum { KS_COL_NAME = 0, KS_COL_PORT, KS_COL_DEFAULT };  enum { KS_COL_NAME = 0, KS_COL_PORT };
49    
50  /* Callback context to modify (add, edit) keyserver items. */  /* Callback context to modify (add, edit) keyserver items. */
51  struct keyserver_rec_s {  struct keyserver_rec_s {
# Line 63  static void Line 62  static void
62  hkp_err_box (HWND dlg, const char *host, WORD port, int rc)  hkp_err_box (HWND dlg, const char *host, WORD port, int rc)
63  {  {
64      const char *err = kserver_strerror ();      const char *err = kserver_strerror ();
65        const char *ws_err = wsock_strerror ();
66      log_box (_("Keyserver"), MB_ERR, "%s:%d: %s",      
67               host, port, winpt_strerror (rc));      if (ws_err && strlen (ws_err) > 0)
68      if (err)          log_box (_("Keyserver"), MB_ERR, "%s:%d: %s", host, port, ws_err);
69          msg_box (dlg, err, wsock_strerror (), MB_ERR);      else
70            log_box (_("Keyserver"), MB_ERR, "%s:%d: %s\n%s",
71                     host, port, winpt_strerror (rc), err? err : "");
72  }  }
73    
74    
# Line 89  hkp_send_key (HWND dlg, const char *kser Line 90  hkp_send_key (HWND dlg, const char *kser
90          msg_box (dlg, gpgme_strerror (ec), _("Export"), MB_ERR);          msg_box (dlg, gpgme_strerror (ec), _("Export"), MB_ERR);
91          goto leave;          goto leave;
92      }      }
93        op_begin ();
94      ec = kserver_sendkey (kserver, port, rawkey, strlen (rawkey));      ec = kserver_sendkey (kserver, port, rawkey, strlen (rawkey));
95        op_end ();
96      if (ec) {      if (ec) {
97          hkp_err_box (dlg, kserver, port, ec);          hkp_err_box (dlg, kserver, port, ec);
98          goto leave;          goto leave;
# Line 169  keyserver_recv_key (HWND dlg, const char Line 172  keyserver_recv_key (HWND dlg, const char
172  {  {
173      gpgme_ctx_t ctx;      gpgme_ctx_t ctx;
174      gpgme_data_t keydata;      gpgme_data_t keydata;
175      gpgme_error_t ec;      gpgme_import_result_t import_res = NULL;
176      gpgme_import_result_t import_res = NULL;          gpgme_error_t err;
177      char *rawkey = NULL;      char *rawkey = NULL;
178        int keylen = 0;
179      int rc;      int rc;
180        
     /* XXX: implement dynamic buffers. */  
     rawkey = new char[MAX_KEYSIZE];  
     if (!rawkey)  
         BUG (0);  
     memset (rawkey, 0, MAX_KEYSIZE);  
181      if (proto == KSPROTO_LDAP) {      if (proto == KSPROTO_LDAP) {
182          rc = ldap_recvkey (kserver, pattern, rawkey, MAX_KEYSIZE-1);          rc = ldap_recvkey (kserver, pattern, &rawkey, &keylen);
183          if (rc) {          if (rc) {
184              msg_box (dlg, _("LDAP key import failed.\n"              msg_box (dlg, _("LDAP key import failed.\n"
185                              "Please make sure you have an online connection"                              "Please make sure you have an online connection"
# Line 191  keyserver_recv_key (HWND dlg, const char Line 190  keyserver_recv_key (HWND dlg, const char
190          }          }
191      }      }
192      else if (proto == KSPROTO_FINGER) {      else if (proto == KSPROTO_FINGER) {
193          rc = finger_recvkey (kserver, pattern, rawkey, MAX_KEYSIZE-1);          rc = finger_recvkey (kserver, pattern, &rawkey, &keylen);
194          if (rc) {          if (rc) {
195              log_box (_("Keyserver"), MB_ERR,              log_box (_("Keyserver"), MB_ERR,
196                       _("Finger key import failed: %s\n"), winpt_strerror (rc));                       _("Finger key import failed: %s\n"), winpt_strerror (rc));
# Line 201  keyserver_recv_key (HWND dlg, const char Line 200  keyserver_recv_key (HWND dlg, const char
200      }      }
201      else if ((rc = kserver_recvkey (kserver, port,      else if ((rc = kserver_recvkey (kserver, port,
202                                      kserver_check_keyid (pattern),                                      kserver_check_keyid (pattern),
203                                      rawkey, MAX_KEYSIZE-1))) {                                      &rawkey, &keylen))) {
204          hkp_err_box (dlg, kserver, port, rc);          hkp_err_box (dlg, kserver, port, rc);
205          free_if_alloc (rawkey);          free_if_alloc (rawkey);
206          return rc;          return rc;
207      }      }
208      else {  
209          if (!strstr (rawkey, "BEGIN PGP PUBLIC KEY BLOCK")) {      if (!strstr (rawkey, "BEGIN PGP PUBLIC KEY BLOCK")) {
210              msg_box (dlg, _("This is not a valid OpenPGP key."),          msg_box (dlg, _("This is not a valid OpenPGP key."),
211                       _("Keyserver"), MB_ERR);              _("Keyserver"), MB_ERR);
212              goto leave;          goto leave;
         }  
         ec = gpgme_new (&ctx);  
         if (ec)  
             BUG (NULL);  
         gpgme_data_new_from_mem (&keydata, rawkey, strlen (rawkey), 1);  
         rc = gpgme_op_import (ctx, keydata);  
         if (rc) {  
             msg_box (dlg, gpgme_strerror ((gpgme_error_t)rc), _("Import"), MB_ERR);  
             goto leave;  
         }  
         import_res = gpgme_op_import_result (ctx);  
         if (import_res && r_fpr)  
             *r_fpr = m_strdup (import_res->imports->fpr);  
213      }      }
214        if (gpgme_new (&ctx))
215            BUG (NULL);
216        gpgme_data_new_from_mem (&keydata, rawkey, strlen (rawkey), 1);
217        err = gpgme_op_import (ctx, keydata);
218        if (err) {
219            msg_box (dlg, gpgme_strerror (err), _("Import"), MB_ERR);
220            goto leave;
221        }
222        import_res = gpgme_op_import_result (ctx);
223        if (import_res && r_fpr)
224            *r_fpr = m_strdup (import_res->imports->fpr);
225            
226      /* if we use the refresh mode, a lot of keys will be fetched and thus only      /* if we use the refresh mode, a lot of keys will be fetched and thus only
227         a summarize at the end is presented and not for each key. */         a summarize at the end is presented and not for each key. */
# Line 269  hkp_recv_key2 (HWND dlg, const char *kse Line 266  hkp_recv_key2 (HWND dlg, const char *kse
266  static int  static int
267  check_pattern (const char *pattern)  check_pattern (const char *pattern)
268  {  {
269      int rc = 1;      int rc = WPTERR_GENERAL;
       
     /* Whitespace are not allowed! */  
     if (strchr (pattern, ' ')) {  
         rc = WPTERR_GENERAL;  
         goto leave;  
     }  
       
     if (((strstr (pattern, "0x")) && (strlen (pattern) == 10)) ||  
          (strstr(pattern, "0x")) && (strlen (pattern)  == 18)) {  
         rc = 0; /* Either long or short keyid */  
         goto leave;  
     }  
       
     if( (( my_iskeychar( pattern[0] )) && ( strlen( pattern )  == 8 ) )  
          || (my_iskeychar(pattern[0])) && ( strlen( pattern ) == 16) ) {  
         rc = 0;  
         goto leave;  
     }  
       
     if ((strchr (pattern, '@')) &&  
         (strlen (pattern) >= 3)) {  
         rc = 0;  
         goto leave;  
     }  
270            
271  leave:      /* do not allow white spaces. */
272        if (strchr (pattern, ' '))
273            return rc;
274    
275        if (strstr (pattern, "0x"))
276            pattern += 2;
277    
278        if (((my_iskeychar (pattern[0])) && (strlen (pattern)  == 8)) ||
279             (my_iskeychar (pattern[0])) && (strlen (pattern) == 16))
280            rc = 0; /* assume long or short key ID. */
281        else if (strchr (pattern, '@') && strlen (pattern) >= 3)
282            rc = 0; /* assume email address. */
283    
284      return rc;      return rc;
285  }  }
286    
# Line 316  name_from_proto (int proto) Line 301  name_from_proto (int proto)
301  }  }
302    
303    
 /* Format the proxy host and display it in the dialog. */  
 static void  
 set_proxy (HWND dlg)  
 {  
     char buf[384];  
   
     if (proxy.host)  
         _snprintf (buf, sizeof (buf)-1, "%s proxy: \"%s:%d\"",  
                    name_from_proto (proxy.proto), proxy.host, proxy.port);  
     else  
         strcpy (buf, _("Proxy: none"));  
     SetDlgItemText (dlg, IDC_KEYSERVER_PROXY, buf);  
 }  
   
   
304  static int inline  static int inline
305  kserver_get_pos (listview_ctrl_t lv)  kserver_get_pos (listview_ctrl_t lv)
306  {  {
# Line 350  kserver_get_port (listview_ctrl_t lv) Line 320  kserver_get_port (listview_ctrl_t lv)
320  }  }
321    
322    
 /* Load the default keyserver and mark it in @lv. */  
323  static void  static void
324  load_default_ks (listview_ctrl_t lv)  set_default_ks (listview_ctrl_t lv)
325  {  {
326      char * p, buf[192];      char *p, buf[200];
327      int i;      int i;
328    
329      p = get_reg_entry_keyserver ("Default");      p = get_reg_entry_keyserver ("Default");
330      if (!p)      if (!p)
331          return;          return;
332      for (i = 0; i < listview_count_items (lv, 0); i++) {      for (i=0; i < listview_count_items (lv, 0); i++) {
333          listview_get_item_text (lv, i, KS_COL_NAME, buf, sizeof (buf)-1);          listview_get_item_text (lv, i, KS_COL_NAME, buf, sizeof (buf)-1);      
334          if (!strncmp (p, buf, strlen (p))) {          if (!strcmp (buf, p)) {
335              listview_add_sub_item (lv, i, KS_COL_DEFAULT, "x");              listview_select_one (lv, i);
336              break;              break;
337          }          }
338      }      }
339      free_if_alloc (p);      free_if_alloc (p);
340  }  }
341    
342    
343  /* Save the selected keyserver from @lv as the default server. */  /* Save the selected keyserver from @lv as the default server. */
344  static int  static int
345  save_default_ks (listview_ctrl_t lv)  save_default_ks (listview_ctrl_t lv)
# Line 383  save_default_ks (listview_ctrl_t lv) Line 353  save_default_ks (listview_ctrl_t lv)
353          return -1;          return -1;
354      }      }
355      listview_get_item_text (lv, idx, KS_COL_NAME, buf, sizeof (buf)-1);      listview_get_item_text (lv, idx, KS_COL_NAME, buf, sizeof (buf)-1);
356      if (!strncmp (buf, "http", 4) && !strncmp (buf, "hkp", 3)) {      if (strncmp (buf, "http", 4) && strncmp (buf, "hkp", 3)) {
357          msg_box (NULL, _("Only HTTP keyserver can be used."),          msg_box (NULL, _("Only HTTP keyserver can be used."),
358                   _("Keyserver"), MB_ERR);                   _("Keyserver"), MB_ERR);
359          return -1;          return -1;
360      }      }
     for (i = 0; i < listview_count_items (lv, 0); i++)  
         listview_add_sub_item (lv, i, KS_COL_DEFAULT, "");  
     listview_add_sub_item (lv, idx, KS_COL_DEFAULT, "x");  
     listview_get_item_text (lv, idx, KS_COL_NAME, buf, sizeof (buf)-1);  
361      set_reg_entry_keyserver ("Default", buf);      set_reg_entry_keyserver ("Default", buf);
362      i = kserver_get_port (lv);      i = kserver_get_port (lv);
363      sprintf (port, "%d", i);      sprintf (port, "%d", i);
# Line 405  int Line 371  int
371  keyserver_list_build (listview_ctrl_t *r_lv, HWND hwnd)  keyserver_list_build (listview_ctrl_t *r_lv, HWND hwnd)
372  {  {
373      struct listview_column_s keyserver[] = {      struct listview_column_s keyserver[] = {
374          {0, 160, (char *)_("DNS Name")},          {0, 180, (char *)_("DNS Name")},
375          {1,  46, (char *)_("Port")},          {1,  55, (char *)_("Port")},
         {2,  60, (char *)_("Default")},  
376          {0,   0, NULL}          {0,   0, NULL}
377      };      };
378      HICON ico[1];      HICON ico[1];
# Line 416  keyserver_list_build (listview_ctrl_t *r Line 381  keyserver_list_build (listview_ctrl_t *r
381      int j;      int j;
382    
383      ico[0] = LoadIcon (glob_hinst, (LPCTSTR)IDI_COMPUTER);      ico[0] = LoadIcon (glob_hinst, (LPCTSTR)IDI_COMPUTER);
384      listview_new (&lv);          listview_new (&lv, hwnd);    
     lv->ctrl = hwnd;  
385      for (j=0; keyserver[j].fieldname; j++)      for (j=0; keyserver[j].fieldname; j++)
386          listview_add_column (lv, &keyserver[j]);          listview_add_column (lv, &keyserver[j]);
387      listview_set_image_list (lv, 16, 16, ico, 1);      listview_set_image_list (lv, 16, 16, ico, 1);
# Line 429  keyserver_list_build (listview_ctrl_t *r Line 393  keyserver_list_build (listview_ctrl_t *r
393          sprintf (buf, "%d", server[j].port);          sprintf (buf, "%d", server[j].port);
394          listview_add_sub_item (lv, 0, KS_COL_PORT, buf);          listview_add_sub_item (lv, 0, KS_COL_PORT, buf);
395      }      }
     load_default_ks (lv);  
396      if (listview_count_items (lv, 0) == 0) {      if (listview_count_items (lv, 0) == 0) {
397          listview_add_item (lv, "");          listview_add_item (lv, "");
398          listview_add_sub_item (lv, 0, KS_COL_NAME, DEF_HKP_KEYSERVER);          listview_add_sub_item (lv, 0, KS_COL_NAME, DEF_HKP_KEYSERVER);
# Line 540  keyserver_modify_dlg_proc (HWND dlg, UIN Line 503  keyserver_modify_dlg_proc (HWND dlg, UIN
503              EnableWindow (GetDlgItem (dlg, IDC_KSERVADD_TYPES), FALSE);              EnableWindow (GetDlgItem (dlg, IDC_KSERVADD_TYPES), FALSE);
504          }          }
505          else          else
506              SetDlgItemInt (dlg, IDC_KSERVADD_PORT, 11371, FALSE);              SetDlgItemInt (dlg, IDC_KSERVADD_PORT, 11371, FALSE);      
507          SetWindowText (dlg, _("Edit Keyserver"));          SetWindowText (dlg, _("Edit Keyserver"));
508          SetDlgItemText (dlg, IDOK, _("&Add"));          SetDlgItemText (dlg, IDOK, _("&Add"));
509          SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));          SetDlgItemText (dlg, IDCANCEL, _("&Cancel"));
# Line 609  keyserver_dlg_proc (HWND dlg, UINT msg, Line 572  keyserver_dlg_proc (HWND dlg, UINT msg,
572          SetDlgItemText (dlg, IDC_KEYSERVER_INFO,          SetDlgItemText (dlg, IDC_KEYSERVER_INFO,
573                          _("Please enter the key ID or email address you search for"));                          _("Please enter the key ID or email address you search for"));
574          SetDlgItemText (dlg, IDC_KEYSERVER_INDEX, _("&Search"));          SetDlgItemText (dlg, IDC_KEYSERVER_INDEX, _("&Search"));
575          SetDlgItemText (dlg, IDC_KEYSERVER_PROXSETT, _("C&hange"));          SetDlgItemText (dlg, IDC_KEYSERVER_PROXSETT, _("C&hange proxy"));
576          SetDlgItemText (dlg, IDC_KEYSERVER_DEFAULT, _("Set &default"));          SetDlgItemText (dlg, IDC_KEYSERVER_DEFAULT, _("Set &default"));
577          SetDlgItemText (dlg, IDCANCEL, _("&Close"));          SetDlgItemText (dlg, IDCANCEL, _("&Close"));
578            
         set_proxy (dlg);  
579          keyserver_list_build (&lv, GetDlgItem (dlg, IDC_KEYSERVER_LIST));          keyserver_list_build (&lv, GetDlgItem (dlg, IDC_KEYSERVER_LIST));
580            set_default_ks (lv);
581          center_window (dlg, NULL);          center_window (dlg, NULL);
582          SetForegroundWindow (dlg);          SetForegroundWindow (dlg);
583          return TRUE;          return TRUE;
# Line 641  keyserver_dlg_proc (HWND dlg, UINT msg, Line 604  keyserver_dlg_proc (HWND dlg, UINT msg,
604              DestroyMenu (hm);              DestroyMenu (hm);
605              DestroyMenu (pop);              DestroyMenu (pop);
606          }          }
607            else if (notify->code == LVN_ITEMCHANGED &&
608                     ((LPNMLISTVIEW)lparam)->uNewState) {
609                /* XXX: disable search for ldap servers. */
610            }
611          return TRUE;          return TRUE;
612                    
613      case WM_DESTROY:      case WM_DESTROY:
# Line 655  keyserver_dlg_proc (HWND dlg, UINT msg, Line 621  keyserver_dlg_proc (HWND dlg, UINT msg,
621      case WM_SYSCOMMAND:      case WM_SYSCOMMAND:
622          if (LOWORD (wparam) == SC_CLOSE)          if (LOWORD (wparam) == SC_CLOSE)
623              EndDialog (dlg, TRUE);              EndDialog (dlg, TRUE);
624          return FALSE;          return FALSE;  
625            
626      case WM_COMMAND:      case WM_COMMAND:
627          switch (LOWORD (wparam)) {          switch (LOWORD (wparam)) {
628          case IDC_KEYSERVER_PROXSETT:          case IDC_KEYSERVER_PROXSETT:
629              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYSERVER_PROXY,              dialog_box_param (glob_hinst, (LPCTSTR)IDD_WINPT_KEYSERVER_PROXY,
630                                dlg, keyserver_proxy_dlg_proc, NULL,                                dlg, keyserver_proxy_dlg_proc, 0,
631                                _("Proxy Settings"), IDS_WINPT_KEYSERVER_PROXY);                                _("Proxy Settings"), IDS_WINPT_KEYSERVER_PROXY);
             set_proxy (dlg);  
632              return TRUE;              return TRUE;
633                            
634          case IDC_KEYSERVER_INDEX:          case IDC_KEYSERVER_INDEX:
Legend:
Removed from v.187  
changed lines
  Added in v.217
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26