Overview
Comment: | ChromeOS: Deal with CACKey crashing by restarting |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
f631a1ccb2ddf11d7e1dced1dd0db7cf |
User & Date: | rkeene on 2016-02-26 21:40:51 |
Other Links: | manifest | tags |
Context
2016-02-28
| ||
21:18 | ChromeOS: Made JavaScript talking to PCSC more robust check-in: 455296a053 user: rkeene tags: trunk | |
2016-02-26
| ||
21:40 | ChromeOS: Deal with CACKey crashing by restarting check-in: f631a1ccb2 user: rkeene tags: trunk | |
21:26 | ChromeOS: Removed deprecated attribution from manifest check-in: 6af094b0e4 user: rkeene tags: trunk | |
Changes
Modified build/chrome/cackey.js from [20b2fe6d64] to [fda208ef5f].
︙ | ︙ | |||
8 9 10 11 12 13 14 15 16 17 18 19 20 21 | return; } /* * Handle for the CACKey NaCl Target */ var cackeyHandle = null; /* * Handle and ID for outstanding callbacks */ var cackeyOutstandingCallbacks = {} var cackeyOutstandingCallbackCounter = -1; | > | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | return; } /* * Handle for the CACKey NaCl Target */ var cackeyHandle = null; var cackeyPCSCHandle = null; /* * Handle and ID for outstanding callbacks */ var cackeyOutstandingCallbacks = {} var cackeyOutstandingCallbackCounter = -1; |
︙ | ︙ | |||
381 382 383 384 385 386 387 388 389 390 391 392 393 394 | if (GoogleSmartCard.IS_DEBUG_BUILD) { console.log("[cackey] Thrown."); } return; } /* * Finish performing initialization that must wait until we have loaded the CACKey module */ function cackeyInitLoaded(messageEvent) { console.log("[cackey] Loaded CACKey PNaCl Module"); | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 | if (GoogleSmartCard.IS_DEBUG_BUILD) { console.log("[cackey] Thrown."); } return; } /* * Uninitializes CACKey (probably due to a crash) */ function cackeyUninit() { if (chrome.certificateProvider) { chrome.certificateProvider.onCertificatesRequested.removeListener(cackeyListCertificates); chrome.certificateProvider.onSignDigestRequested.removeListener(cackeySignMessage); } if (cackeyPCSCHandle != null) { delete cackeyPCSCHandle; cackeyPCSCHandle = null; } if (cackeyHandle != null) { try { document.body.removeChild(cackeyHandle); } catch (e) { } delete cackeyHandle; cackeyHandle = null; } } /* * Restarts CACKey */ function cackeyRestart() { cackeyUninit(); cackeyInit(); } /* * Handle a CACKey crash (probably due to loss of connectivity to the PCSC daemon) */ function cackeyCrash() { /* * Schedule the restart to occur in 30 seconds in case we really are * not working. */ setTimeout(cackeyRestart, 30000); } /* * Finish performing initialization that must wait until we have loaded the CACKey module */ function cackeyInitLoaded(messageEvent) { console.log("[cackey] Loaded CACKey PNaCl Module"); |
︙ | ︙ | |||
408 409 410 411 412 413 414 | "smartcardManagerAppId": "khpfeaanjngmcnplbdlpegiifgpfgdco" } ); /* * Start the Google PCSC Interface */ | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > | 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 | "smartcardManagerAppId": "khpfeaanjngmcnplbdlpegiifgpfgdco" } ); /* * Start the Google PCSC Interface */ cackeyPCSCHandle = new GoogleSmartCard.PcscNacl(cackeyHandle); return; } /* * Initialize CACKey and the PCSC library from Google */ function cackeyInit() { var elementEmbed; var forceLoadElement; /* Log that we are operational */ console.log("[cackey] cackeyInit(): Called."); /* * Do not initialize multiple times */ if (cackeyHandle != null) { console.log("[cackey] cackeyInit(): Already initialized. Returning."); return; } /* Verify that we can register callbacks */ if (!chrome.certificateProvider) { if (!GoogleSmartCard.IS_DEBUG_BUILD) { console.error("[cackey] This extension only works on ChromeOS!"); return; } else { console.log("[cackey] This extension only works on ChromeOS, but you appear to be debugging it -- trying anyway."); } } elementEmbed = document.createElement('embed'); elementEmbed.type = "application/x-pnacl"; elementEmbed.width = 0; elementEmbed.height = 0; elementEmbed.src = "cackey.nmf"; elementEmbed.id = "cackeyModule"; elementEmbed.addEventListener('error', function(messageEvent) { console.error("Error loading CACKey PNaCl Module: " + messageEvent.data); }, true); elementEmbed.addEventListener('load', cackeyInitLoaded, true); elementEmbed.addEventListener('crash', cackeyCrash, true); elementEmbed.addEventListener('message', cackeyMessageIncoming, true); cackeyHandle = elementEmbed; document.body.appendChild(cackeyHandle) /* * Force the browser to load the element * by requesting its position */ forceLoadElement = cackeyHandle.offsetTop; console.log("[cackey] cackeyInit(): Completed. Returning."); } /* * Initialize the CACKey Chrome Application */ function cackeyAppInit() { /* * Create a handler for starting the application UI */ chrome.app.runtime.onLaunched.addListener(function() { chrome.app.window.create('ui.html', { "id": "cackeyUI", "focused": true, "innerBounds": { "width": 350, "minWidth": 350, "height": 135, "minHeight": 135 } }); }); } /* Initialize CACKey */ cackeyAppInit(); cackeyInit(); |