Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SPARK-1189: Add Security to Spark - Akka, Http, ConnectionManager, UI use servlets #33

Closed
wants to merge 16 commits into from
Closed

SPARK-1189: Add Security to Spark - Akka, Http, ConnectionManager, UI use servlets #33

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f351763
Add Security to Spark - Akka, Http, ConnectionManager, UI to use serv…
tgravescs Jan 19, 2014
5721c5a
update AkkaUtilsSuite test for the actorSelection changes, fix typos …
tgravescs Jan 20, 2014
2d9e23e
Merge remote-tracking branch 'upstream/master' into security-branch-0…
tgravescs Feb 18, 2014
6f7ddf3
Convert SaslClient and SaslServer to scala, change spark.authenticate…
tgravescs Feb 22, 2014
ed3d1c1
Add security.md
tgravescs Feb 22, 2014
b514bec
Fix reference to config
tgravescs Feb 22, 2014
ecbfb65
Fix spacing and formatting
tgravescs Feb 22, 2014
50dd9f2
fix header in SecurityManager
tgravescs Feb 22, 2014
2f77147
Rework from comments
tgravescs Mar 3, 2014
4a57acc
Change UI createHandler routines to createServlet since they now retu…
tgravescs Mar 3, 2014
13733e1
Pass securityManager and SparkConf around where we can. Switch to use…
tgravescs Mar 6, 2014
ac046b3
Merge remote-tracking branch 'upstream/master' into security-branch-0…
tgravescs Mar 6, 2014
05ff5e0
Fix up imports after upmerging to master
tgravescs Mar 6, 2014
d1040ec
Fix up various imports
tgravescs Mar 6, 2014
05eebed
Fix dependency lost in upmerge
tgravescs Mar 6, 2014
dfe3918
Fix merge conflict since startUserClass now using runAsUser
tgravescs Mar 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix up various imports
  • Loading branch information
@tgravescs
tgravescs committed Mar 6, 2014
commit d1040ecfca0458c88457d0d6e2bc02d1d68c4e47
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/deploy/master/Master.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import akka.pattern.ask
import akka.remote.{DisassociatedEvent, RemotingLifecycleEvent}
import akka.serialization.SerializationExtension

import org.apache.spark.{SecurityManager, SparkConf, Logging, SparkException}
import org.apache.spark.{Logging, SecurityManager, SparkConf, SparkException}
import org.apache.spark.deploy.{ApplicationDescription, DriverDescription, ExecutorState}
import org.apache.spark.deploy.DeployMessages._
import org.apache.spark.deploy.master.DriverState.DriverState
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/metrics/MetricsSystem.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import scala.collection.mutable

import com.codahale.metrics.{Metric, MetricFilter, MetricRegistry}

import org.apache.spark.{SecurityManager, SparkConf, Logging}
import org.apache.spark.{Logging, SecurityManager, SparkConf}
import org.apache.spark.metrics.sink.{MetricsServlet, Sink}
import org.apache.spark.metrics.source.Source

Expand Down
1 change: 0 additions & 1 deletion core/src/main/scala/org/apache/spark/network/SenderTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.spark.network

import java.nio.ByteBuffer
import java.net.InetAddress
import org.apache.spark.{SecurityManager, SparkConf}

private[spark] object SenderTest {
Expand Down
4 changes: 1 addition & 3 deletions core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@ import org.eclipse.jetty.server.handler.HandlerList
import org.eclipse.jetty.servlet.{DefaultServlet, FilterHolder, ServletContextHandler, ServletHolder}
import org.eclipse.jetty.util.thread.QueuedThreadPool

import org.apache.spark.Logging
import org.apache.spark.SecurityManager
import org.apache.spark.SparkConf
import org.apache.spark.{Logging, SecurityManager, SparkConf}


/** Utilities for launching a web server using Jetty's HTTP Server class */
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/util/Utils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package org.apache.spark.util

import java.io._
import java.net.{InetAddress, Inet4Address, NetworkInterface, URI, URL}
import java.net.{InetAddress, Inet4Address, NetworkInterface, URI, URL, URLConnection}
import java.nio.ByteBuffer
import java.util.{Locale, Random, UUID}
import java.util.concurrent.{ConcurrentHashMap, Executors, ThreadPoolExecutor}
Expand Down